Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump twitter-bootstrap-rails from 2.2.8 to 3.2.0 #51

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump twitter-bootstrap-rails from 2.2.8 to 3.2.0 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ gem 'dotenv-rails'

# for bootstrap
gem 'less-rails'
gem 'twitter-bootstrap-rails', '~> 2.2.8'
gem 'twitter-bootstrap-rails', '~> 3.2.0'
# datetime picker for bootstrap
gem 'bootstrap3-datetimepicker-rails', '~> 3.1.3'

Expand Down
34 changes: 18 additions & 16 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ GEM
slim (>= 1.3.6, < 3.0)
terminal-table (~> 1.4)
browser (0.8.0)
builder (3.2.2)
builder (3.2.4)
cancancan (1.13.1)
capybara (2.4.1)
mime-types (>= 1.16)
Expand Down Expand Up @@ -162,6 +162,7 @@ GEM
sass (~> 3.2.5)
compass-rails (2.0.0)
compass (>= 0.12.2)
concurrent-ruby (1.2.2)
crack (0.4.2)
safe_yaml (~> 1.0.0)
css_parser (1.3.5)
Expand Down Expand Up @@ -194,7 +195,7 @@ GEM
exception_notification (4.0.1)
actionmailer (>= 3.0.4)
activesupport (>= 3.0.4)
execjs (2.6.0)
execjs (2.8.1)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.1)
Expand Down Expand Up @@ -236,7 +237,8 @@ GEM
httpi (2.4.2)
rack
socksify
i18n (0.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
i18n-js (3.0.0.rc12)
i18n (~> 0.6, >= 0.6.6)
icalendar (2.1.1)
Expand All @@ -249,7 +251,7 @@ GEM
jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
json (1.8.6)
launchy (2.4.2)
addressable (~> 2.3)
leaflet-rails (0.7.4)
Expand All @@ -273,7 +275,7 @@ GEM
activesupport (>= 3)
railties (>= 3)
logstash-event (1.2.02)
mail (2.6.4)
mail (2.6.6)
mime-types (>= 1.16, < 4)
mailcatcher (0.6.1)
activesupport (>= 4.0.0, < 5)
Expand All @@ -289,7 +291,7 @@ GEM
subexec (~> 0.2.1)
mini_portile2 (2.0.0)
minitar (0.5.4)
minitest (5.8.4)
minitest (5.18.0)
mixlib-authentication (1.3.0)
mixlib-log
mixlib-cli (1.5.0)
Expand All @@ -299,7 +301,7 @@ GEM
momentjs-rails (2.8.3)
railties (>= 3.1)
mono_logger (1.1.0)
multi_json (1.12.0)
multi_json (1.15.0)
multi_xml (0.5.5)
mysql2 (0.3.21)
net-dhcp (1.3.2)
Expand Down Expand Up @@ -494,18 +496,18 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.19.1)
thread_safe (0.3.5)
thor (0.20.3)
thread_safe (0.3.6)
tilt (1.4.1)
timecop (0.8.0)
turn (0.8.2)
ansi (>= 1.2.2)
twitter-bootstrap-rails (2.2.8)
actionpack (>= 3.1)
execjs
rails (>= 3.1)
railties (>= 3.1)
tzinfo (1.2.2)
twitter-bootstrap-rails (3.2.0)
actionpack (~> 4.1)
execjs (~> 2.2)
rails (~> 4.1)
railties (~> 4.1)
tzinfo (1.2.11)
thread_safe (~> 0.1)
tzinfo-data (1.2021.5)
tzinfo (>= 1.0.0)
Expand Down Expand Up @@ -643,7 +645,7 @@ DEPENDENCIES
timecop
translate-rails3!
turn (= 0.8.2)
twitter-bootstrap-rails (~> 2.2.8)
twitter-bootstrap-rails (~> 3.2.0)
tzinfo-data
uglifier (>= 1.0.3)
valid_email (~> 0.0.10)
Expand Down