Upgrade rails and sass-rails gems
This commit is contained in:
parent
64c471c2ae
commit
51c5cc5590
4
Gemfile
4
Gemfile
@ -1,8 +1,8 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '4.0.3'
|
||||
gem 'rails', '4.0.4'
|
||||
|
||||
gem 'sass-rails', '~> 4.0.1'
|
||||
gem 'sass-rails', '~> 4.0.3'
|
||||
gem 'coffee-rails', '~> 4.0.1'
|
||||
gem 'uglifier', '>= 2.3.1'
|
||||
gem 'jquery-rails', '~> 3.0.4'
|
||||
|
63
Gemfile.lock
63
Gemfile.lock
@ -10,28 +10,28 @@ GIT
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.0.3)
|
||||
actionpack (= 4.0.3)
|
||||
actionmailer (4.0.4)
|
||||
actionpack (= 4.0.4)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.0.3)
|
||||
activesupport (= 4.0.3)
|
||||
actionpack (4.0.4)
|
||||
activesupport (= 4.0.4)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
active_model_serializers (0.8.1)
|
||||
activemodel (>= 3.0)
|
||||
activemodel (4.0.3)
|
||||
activesupport (= 4.0.3)
|
||||
activemodel (4.0.4)
|
||||
activesupport (= 4.0.4)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.3)
|
||||
activemodel (= 4.0.3)
|
||||
activerecord (4.0.4)
|
||||
activemodel (= 4.0.4)
|
||||
activerecord-deprecated_finders (~> 1.0.2)
|
||||
activesupport (= 4.0.3)
|
||||
activesupport (= 4.0.4)
|
||||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.3)
|
||||
activesupport (4.0.3)
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
activesupport (4.0.4)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
@ -40,7 +40,6 @@ GEM
|
||||
builder
|
||||
json
|
||||
arel (4.0.2)
|
||||
atomic (1.1.14)
|
||||
axiom-types (0.0.5)
|
||||
descendants_tracker (~> 0.0.1)
|
||||
ice_nine (~> 0.9)
|
||||
@ -165,7 +164,7 @@ GEM
|
||||
method_source (0.8.2)
|
||||
mime-types (1.25.1)
|
||||
minitest (4.7.5)
|
||||
multi_json (1.8.4)
|
||||
multi_json (1.9.2)
|
||||
multipart-post (1.2.0)
|
||||
net-scp (1.0.4)
|
||||
net-ssh (>= 1.99.1)
|
||||
@ -220,17 +219,17 @@ GEM
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (4.0.3)
|
||||
actionmailer (= 4.0.3)
|
||||
actionpack (= 4.0.3)
|
||||
activerecord (= 4.0.3)
|
||||
activesupport (= 4.0.3)
|
||||
rails (4.0.4)
|
||||
actionmailer (= 4.0.4)
|
||||
actionpack (= 4.0.4)
|
||||
activerecord (= 4.0.4)
|
||||
activesupport (= 4.0.4)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.3)
|
||||
railties (= 4.0.4)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
railties (4.0.3)
|
||||
actionpack (= 4.0.3)
|
||||
activesupport (= 4.0.3)
|
||||
railties (4.0.4)
|
||||
actionpack (= 4.0.4)
|
||||
activesupport (= 4.0.4)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
raindrops (0.12.0)
|
||||
@ -263,11 +262,12 @@ GEM
|
||||
rspec-mocks (= 3.0.0.beta1)
|
||||
rspec-support (3.0.0.beta1)
|
||||
ruby-hmac (0.4.0)
|
||||
sass (3.2.12)
|
||||
sass-rails (4.0.1)
|
||||
sass (3.2.19)
|
||||
sass-rails (4.0.3)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (>= 3.1.10)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
sass (~> 3.2.0)
|
||||
sprockets (~> 2.8, <= 2.11.0)
|
||||
sprockets-rails (~> 2.0)
|
||||
shoulda-matchers (2.4.0)
|
||||
activesupport (>= 3.0.0)
|
||||
sidekiq (2.17.0)
|
||||
@ -313,9 +313,8 @@ GEM
|
||||
daemons (>= 1.0.9)
|
||||
eventmachine (>= 0.12.6)
|
||||
rack (>= 1.0.0)
|
||||
thor (0.18.1)
|
||||
thread_safe (0.1.3)
|
||||
atomic
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.3)
|
||||
tilt (1.4.1)
|
||||
timecop (0.7.1)
|
||||
timers (1.1.0)
|
||||
@ -323,7 +322,7 @@ GEM
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.38)
|
||||
tzinfo (0.3.39)
|
||||
uglifier (2.3.1)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
@ -380,12 +379,12 @@ DEPENDENCIES
|
||||
poltergeist (~> 1.5.0)
|
||||
pry-rails (~> 0.3.2)
|
||||
quiet_assets (~> 1.0.1)
|
||||
rails (= 4.0.3)
|
||||
rails (= 4.0.4)
|
||||
rake (~> 10.0.4)
|
||||
rb-inotify (~> 0.9.0)
|
||||
redcarpet (~> 2.2.2)
|
||||
rspec-rails (~> 3.0.0.beta1)
|
||||
sass-rails (~> 4.0.1)
|
||||
sass-rails (~> 4.0.3)
|
||||
shoulda-matchers (~> 2.4.0)
|
||||
sidekiq (~> 2.17)
|
||||
simple_form (~> 3.0.2)
|
||||
|
Loading…
Reference in New Issue
Block a user