Skip to content

Commit

Permalink
bump to next version
Browse files Browse the repository at this point in the history
  • Loading branch information
seyhunak committed Feb 6, 2017
1 parent 14e846e commit 346f1a8
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 23 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ pkg/*
coverage/*
.ruby-version
.ruby-gemset

.idea/
.idea/
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ rvm:
- 1.9.3
- 2.0.0
- 2.1.1
- 2.1.2
- 2.1.3
script: bundle exec rake spec
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@
<li>Releases gem v.3.2.1</li>
<li>Releases gem v.3.2.2</li>
<li>Dropped FontAwesome support, see #889</li>
</ul>
<li>Releases gem v.4.0.0> (master changes)<li>
</ul>
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source "http://rubygems.org"
# Specify your gem's dependencies in twitter-bootstrap-rails.gemspec
gemspec
gem 'less-rails', :path => ENV['LESS_RAILS_SOURCE'] if ENV['LESS_RAILS_SOURCE']
gem 'activesupport', '< 4.0.0' if RUBY_VERSION < '1.9.3'
gem 'activesupport', '< 5.0.1' if RUBY_VERSION < '2.1.3'

group :development, :test do
gem 'rb-readline'
Expand Down
19 changes: 8 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Twitter Bootstrap for Rails 4, 3.x Asset Pipeline
Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites. It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
# Twitter Bootstrap for Rails 5 and Rails 4 Asset Pipeline

Bootstrap is a toolkit from Twitter designed to kickstart development of web apps and sites. It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.

twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails Asset Pipeline (Rails 4, 3.x versions are supported)

Expand All @@ -12,13 +13,13 @@ twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails Asset
#### Installing twitter-bootstrap-rails, generators, usage and more
<img width="180" height="35" src="http://oi49.tinypic.com/s5wn05.jpg"></img>

Screencasts provided by <a href="http://railscasts.com">Railscasts</a> (Ryan Bates)
Screencasts provided by <a href="http://railscasts.com">RailsCasts</a> (Ryan Bates)

[Twitter Bootstrap Basics](http://railscasts.com/episodes/328-twitter-bootstrap-basics "Twitter Bootstrap Basics")
in this episode you will learn how to include Bootstrap into Rails application with the twitter-bootstrap-rails gem.

[More on Twitter Bootstrap](http://railscasts.com/episodes/329-more-on-twitter-bootstrap "More on Twitter Bootstrap")
in this episode continues on the Bootstrap project showing how to display flash messages, add form validations with SimpleForm, customize layout with variables, and switch to using Sass.
in this episode continues on the Bootstrap project showing how to display flash messages, add form validations with SimpleForm, customise layout with variables, and switch to using Sass.
(Note: This episode is pro episode)

## Installing the Gem
Expand All @@ -27,7 +28,7 @@ The [Twitter Bootstrap Rails gem](http://rubygems.org/gems/twitter-bootstrap-rai

The plain CSS way is how Bootstrap is provided on [the official website](http://twbs.github.io/bootstrap/).

The [Less](http://lesscss.org/) way provides more customization options, like changing theme colors, and provides useful Less mixins for your code, but requires the
The [Less](http://lesscss.org/) way provides more customisation options, like changing theme colors and provides useful Less mixins for your code, but requires the
Less gem and the Ruby Racer Javascript runtime (not available on Microsoft Windows).

### Installing the Less stylesheets
Expand Down Expand Up @@ -615,23 +616,19 @@ Please see CHANGELOG.md for more details
## Contributors & Patches & Forks
Please see CONTRIBUTERS.md for contributors list


## About Me
Senior Software Developer @INGBank
Senior Software Developer
Istanbul / Turkey


### Contact me
Seyhun Akyürek - seyhunak [at] gmail com


## Thanks
Bootstrap and all twitter-bootstrap-rails contributors
http://twbs.github.io/bootstrap


## License
Copyright (c) 2014 Seyhun Akyürek
Copyright (c) 2017 (since 2012) by Seyhun Akyürek

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
Expand Down
2 changes: 1 addition & 1 deletion lib/twitter/bootstrap/rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Twitter
module Bootstrap
module Rails
VERSION = "3.2.2"
VERSION = "4.0.0"
end
end
end
13 changes: 6 additions & 7 deletions twitter-bootstrap-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_dependency 'railties', '>= 3.1'
s.add_dependency 'actionpack', '>= 3.1'
s.add_dependency 'less-rails', '>= 2.5.0'

s.add_runtime_dependency 'execjs', '>= 2.2', '>= 2.2.2'
s.add_development_dependency 'rails', '>= 3.1'
s.add_dependency 'railties', '>= 5.0.1'
s.add_dependency 'actionpack', '>= 5.0.1'
s.add_dependency 'less-rails', '>= 2.8.0'

s.add_runtime_dependency 'execjs', '>= 2.7', '>= 2.7.0'
s.add_development_dependency 'rails', '>= 5.0.1'
s.add_development_dependency 'less', '>= 2.6', '>= 2.6.0'
s.add_development_dependency 'therubyracer', '>= 0.12', '>= 0.12.1'
s.add_development_dependency 'therubyracer', '>= 0.12', '>= 0.12.3'

s.post_install_message = "Important: You may need to add a javascript runtime to your Gemfile in order for bootstrap's LESS files to compile to CSS. \n\n" \
"**********************************************\n\n" \
Expand Down

0 comments on commit 346f1a8

Please sign in to comment.