Update: rails 4.0.2 -> 4.0.4, bootstrap-sass 3.0.0.0 -> 3.1.1.0
This commit is contained in:
parent
a0ee97482a
commit
facadc324c
2 changed files with 46 additions and 45 deletions
4
Gemfile
4
Gemfile
|
|
@ -1,11 +1,11 @@
|
||||||
# -*- mode: yaml; -*-
|
# -*- mode: yaml; -*-
|
||||||
source 'http://rubygems.org'
|
source 'http://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '4.0.2'
|
gem 'rails', '4.0.4'
|
||||||
|
|
||||||
gem 'pg'
|
gem 'pg'
|
||||||
|
|
||||||
gem 'bootstrap-sass', '~> 3.0.0.0'
|
gem 'bootstrap-sass', '~> 3.1.1.0'
|
||||||
|
|
||||||
# Bourbon: fancy css mixins – https://github.com/thoughtbot/bourbon
|
# Bourbon: fancy css mixins – https://github.com/thoughtbot/bourbon
|
||||||
gem 'bourbon'
|
gem 'bourbon'
|
||||||
|
|
|
||||||
87
Gemfile.lock
87
Gemfile.lock
|
|
@ -1,53 +1,55 @@
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.0.2)
|
actionmailer (4.0.4)
|
||||||
actionpack (= 4.0.2)
|
actionpack (= 4.0.4)
|
||||||
mail (~> 2.5.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (4.0.2)
|
actionpack (4.0.4)
|
||||||
activesupport (= 4.0.2)
|
activesupport (= 4.0.4)
|
||||||
builder (~> 3.1.0)
|
builder (~> 3.1.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rack (~> 1.5.2)
|
rack (~> 1.5.2)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
activemodel (4.0.2)
|
activemodel (4.0.4)
|
||||||
activesupport (= 4.0.2)
|
activesupport (= 4.0.4)
|
||||||
builder (~> 3.1.0)
|
builder (~> 3.1.0)
|
||||||
activerecord (4.0.2)
|
activerecord (4.0.4)
|
||||||
activemodel (= 4.0.2)
|
activemodel (= 4.0.4)
|
||||||
activerecord-deprecated_finders (~> 1.0.2)
|
activerecord-deprecated_finders (~> 1.0.2)
|
||||||
activesupport (= 4.0.2)
|
activesupport (= 4.0.4)
|
||||||
arel (~> 4.0.0)
|
arel (~> 4.0.0)
|
||||||
activerecord-deprecated_finders (1.0.3)
|
activerecord-deprecated_finders (1.0.3)
|
||||||
activesupport (4.0.2)
|
activesupport (4.0.4)
|
||||||
i18n (~> 0.6, >= 0.6.4)
|
i18n (~> 0.6, >= 0.6.9)
|
||||||
minitest (~> 4.2)
|
minitest (~> 4.2)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
tzinfo (~> 0.3.37)
|
tzinfo (~> 0.3.37)
|
||||||
arel (4.0.1)
|
arel (4.0.2)
|
||||||
atomic (1.1.14)
|
bcrypt (3.1.7)
|
||||||
bcrypt-ruby (3.1.2)
|
bcrypt-ruby (3.1.5)
|
||||||
bootstrap-sass (3.0.0.0)
|
bcrypt (>= 3.1.3)
|
||||||
|
bootstrap-sass (3.1.1.0)
|
||||||
sass (~> 3.2)
|
sass (~> 3.2)
|
||||||
bourbon (3.1.8)
|
bourbon (3.1.8)
|
||||||
sass (>= 3.2.0)
|
sass (>= 3.2.0)
|
||||||
thor
|
thor
|
||||||
builder (3.1.4)
|
builder (3.1.4)
|
||||||
cancan (1.6.10)
|
cancan (1.6.10)
|
||||||
carrierwave (0.9.0)
|
carrierwave (0.10.0)
|
||||||
activemodel (>= 3.2.0)
|
activemodel (>= 3.2.0)
|
||||||
activesupport (>= 3.2.0)
|
activesupport (>= 3.2.0)
|
||||||
json (>= 1.7)
|
json (>= 1.7)
|
||||||
|
mime-types (>= 1.16)
|
||||||
coffee-rails (4.0.1)
|
coffee-rails (4.0.1)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
coffee-script (2.2.0)
|
coffee-script (2.2.0)
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.6.3)
|
coffee-script-source (1.7.0)
|
||||||
devise (3.2.2)
|
devise (3.2.4)
|
||||||
bcrypt-ruby (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
railties (>= 3.2.6, < 5)
|
railties (>= 3.2.6, < 5)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
|
|
@ -56,7 +58,7 @@ GEM
|
||||||
execjs (2.0.2)
|
execjs (2.0.2)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
i18n (0.6.9)
|
i18n (0.6.9)
|
||||||
jquery-rails (3.0.4)
|
jquery-rails (3.1.0)
|
||||||
railties (>= 3.0, < 5.0)
|
railties (>= 3.0, < 5.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
json (1.8.1)
|
json (1.8.1)
|
||||||
|
|
@ -69,35 +71,35 @@ GEM
|
||||||
open4
|
open4
|
||||||
rake
|
rake
|
||||||
minitest (4.7.5)
|
minitest (4.7.5)
|
||||||
multi_json (1.8.2)
|
multi_json (1.9.2)
|
||||||
open4 (1.3.0)
|
open4 (1.3.3)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
pg (0.17.1)
|
pg (0.17.1)
|
||||||
polyglot (0.3.3)
|
polyglot (0.3.4)
|
||||||
rack (1.5.2)
|
rack (1.5.2)
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.0.2)
|
rails (4.0.4)
|
||||||
actionmailer (= 4.0.2)
|
actionmailer (= 4.0.4)
|
||||||
actionpack (= 4.0.2)
|
actionpack (= 4.0.4)
|
||||||
activerecord (= 4.0.2)
|
activerecord (= 4.0.4)
|
||||||
activesupport (= 4.0.2)
|
activesupport (= 4.0.4)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.0.2)
|
railties (= 4.0.4)
|
||||||
sprockets-rails (~> 2.0.0)
|
sprockets-rails (~> 2.0.0)
|
||||||
railties (4.0.2)
|
railties (4.0.4)
|
||||||
actionpack (= 4.0.2)
|
actionpack (= 4.0.4)
|
||||||
activesupport (= 4.0.2)
|
activesupport (= 4.0.4)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (10.1.1)
|
rake (10.2.2)
|
||||||
ref (1.0.5)
|
ref (1.0.5)
|
||||||
sass (3.2.13)
|
sass (3.3.4)
|
||||||
sass-rails (4.0.1)
|
sass-rails (4.0.1)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (>= 3.1.10)
|
sass (>= 3.1.10)
|
||||||
sprockets-rails (~> 2.0.0)
|
sprockets-rails (~> 2.0.0)
|
||||||
sprockets (2.10.1)
|
sprockets (2.12.0)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
|
|
@ -106,18 +108,17 @@ GEM
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (~> 2.8)
|
sprockets (~> 2.8)
|
||||||
therubyracer (0.12.0)
|
therubyracer (0.12.1)
|
||||||
libv8 (~> 3.16.14.0)
|
libv8 (~> 3.16.14.0)
|
||||||
ref
|
ref
|
||||||
thor (0.18.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.1.3)
|
thread_safe (0.3.2)
|
||||||
atomic
|
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
tzinfo (0.3.38)
|
tzinfo (0.3.39)
|
||||||
uglifier (2.4.0)
|
uglifier (2.5.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
json (>= 1.8.0)
|
json (>= 1.8.0)
|
||||||
warden (1.2.3)
|
warden (1.2.3)
|
||||||
|
|
@ -128,7 +129,7 @@ PLATFORMS
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
bcrypt-ruby
|
bcrypt-ruby
|
||||||
bootstrap-sass (~> 3.0.0.0)
|
bootstrap-sass (~> 3.1.1.0)
|
||||||
bourbon
|
bourbon
|
||||||
cancan
|
cancan
|
||||||
carrierwave
|
carrierwave
|
||||||
|
|
@ -138,7 +139,7 @@ DEPENDENCIES
|
||||||
mail
|
mail
|
||||||
mina
|
mina
|
||||||
pg
|
pg
|
||||||
rails (= 4.0.2)
|
rails (= 4.0.4)
|
||||||
sass-rails
|
sass-rails
|
||||||
therubyracer
|
therubyracer
|
||||||
uglifier
|
uglifier
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue