Rails 4.0.4 -> 4.2.4 (to sync with the server)
This commit is contained in:
Roland Jesse
parent
649f28c43c
commit
477d5c4551
2 changed files with 114 additions and 80 deletions
2
Gemfile
2
Gemfile
|
|
@ -1,7 +1,7 @@
|
||||||
# -*- mode: yaml; -*-
|
# -*- mode: yaml; -*-
|
||||||
source 'http://rubygems.org'
|
source 'http://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '4.0.4'
|
gem 'rails', '4.2.4'
|
||||||
|
|
||||||
gem 'pg'
|
gem 'pg'
|
||||||
|
|
||||||
|
|
|
||||||
192
Gemfile.lock
192
Gemfile.lock
|
|
@ -1,124 +1,155 @@
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.0.4)
|
actionmailer (4.2.4)
|
||||||
actionpack (= 4.0.4)
|
actionpack (= 4.2.4)
|
||||||
mail (~> 2.5.4)
|
actionview (= 4.2.4)
|
||||||
actionpack (4.0.4)
|
activejob (= 4.2.4)
|
||||||
activesupport (= 4.0.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
builder (~> 3.1.0)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
erubis (~> 2.7.0)
|
actionpack (4.2.4)
|
||||||
rack (~> 1.5.2)
|
actionview (= 4.2.4)
|
||||||
|
activesupport (= 4.2.4)
|
||||||
|
rack (~> 1.6)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
activemodel (4.0.4)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
activesupport (= 4.0.4)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
builder (~> 3.1.0)
|
actionview (4.2.4)
|
||||||
activerecord (4.0.4)
|
activesupport (= 4.2.4)
|
||||||
activemodel (= 4.0.4)
|
builder (~> 3.1)
|
||||||
activerecord-deprecated_finders (~> 1.0.2)
|
erubis (~> 2.7.0)
|
||||||
activesupport (= 4.0.4)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
arel (~> 4.0.0)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
activerecord-deprecated_finders (1.0.3)
|
activejob (4.2.4)
|
||||||
activesupport (4.0.4)
|
activesupport (= 4.2.4)
|
||||||
i18n (~> 0.6, >= 0.6.9)
|
globalid (>= 0.3.0)
|
||||||
minitest (~> 4.2)
|
activemodel (4.2.4)
|
||||||
multi_json (~> 1.3)
|
activesupport (= 4.2.4)
|
||||||
thread_safe (~> 0.1)
|
builder (~> 3.1)
|
||||||
tzinfo (~> 0.3.37)
|
activerecord (4.2.4)
|
||||||
arel (4.0.2)
|
activemodel (= 4.2.4)
|
||||||
bcrypt (3.1.7)
|
activesupport (= 4.2.4)
|
||||||
|
arel (~> 6.0)
|
||||||
|
activesupport (4.2.4)
|
||||||
|
i18n (~> 0.7)
|
||||||
|
json (~> 1.7, >= 1.7.7)
|
||||||
|
minitest (~> 5.1)
|
||||||
|
thread_safe (~> 0.3, >= 0.3.4)
|
||||||
|
tzinfo (~> 1.1)
|
||||||
|
arel (6.0.3)
|
||||||
|
bcrypt (3.1.10)
|
||||||
bcrypt-ruby (3.1.5)
|
bcrypt-ruby (3.1.5)
|
||||||
bcrypt (>= 3.1.3)
|
bcrypt (>= 3.1.3)
|
||||||
bootstrap-sass (3.1.1.0)
|
bootstrap-sass (3.1.1.1)
|
||||||
sass (~> 3.2)
|
sass (~> 3.2)
|
||||||
bourbon (3.1.8)
|
bourbon (4.2.4)
|
||||||
sass (>= 3.2.0)
|
sass (~> 3.4)
|
||||||
thor
|
thor (~> 0.19)
|
||||||
builder (3.1.4)
|
builder (3.2.2)
|
||||||
cancan (1.6.10)
|
cancan (1.6.10)
|
||||||
carrierwave (0.10.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)
|
mime-types (>= 1.16)
|
||||||
coffee-rails (4.0.1)
|
coffee-rails (4.1.0)
|
||||||
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.4.1)
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.7.0)
|
coffee-script-source (1.9.1.1)
|
||||||
devise (3.2.4)
|
devise (3.5.2)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
railties (>= 3.2.6, < 5)
|
railties (>= 3.2.6, < 5)
|
||||||
|
responders
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (2.0.2)
|
execjs (2.6.0)
|
||||||
|
globalid (0.3.6)
|
||||||
|
activesupport (>= 4.1.0)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
i18n (0.6.9)
|
i18n (0.7.0)
|
||||||
jquery-rails (3.1.0)
|
jquery-rails (4.0.5)
|
||||||
railties (>= 3.0, < 5.0)
|
rails-dom-testing (~> 1.0)
|
||||||
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
json (1.8.1)
|
json (1.8.3)
|
||||||
libv8 (3.16.14.3)
|
libv8 (3.16.14.11)
|
||||||
mail (2.5.4)
|
loofah (2.0.3)
|
||||||
mime-types (~> 1.16)
|
nokogiri (>= 1.5.9)
|
||||||
treetop (~> 1.4.8)
|
mail (2.6.3)
|
||||||
mime-types (1.25.1)
|
mime-types (>= 1.16, < 3)
|
||||||
mina (0.3.0)
|
mime-types (2.6.1)
|
||||||
open4
|
mina (0.3.7)
|
||||||
|
open4 (~> 1.3.4)
|
||||||
rake
|
rake
|
||||||
minitest (4.7.5)
|
mini_portile (0.6.2)
|
||||||
multi_json (1.9.2)
|
minitest (5.8.0)
|
||||||
open4 (1.3.3)
|
multi_json (1.11.2)
|
||||||
|
nokogiri (1.6.6.2)
|
||||||
|
mini_portile (~> 0.6.0)
|
||||||
|
open4 (1.3.4)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
pg (0.17.1)
|
pg (0.18.3)
|
||||||
polyglot (0.3.4)
|
rack (1.6.4)
|
||||||
rack (1.5.2)
|
rack-test (0.6.3)
|
||||||
rack-test (0.6.2)
|
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.0.4)
|
rails (4.2.4)
|
||||||
actionmailer (= 4.0.4)
|
actionmailer (= 4.2.4)
|
||||||
actionpack (= 4.0.4)
|
actionpack (= 4.2.4)
|
||||||
activerecord (= 4.0.4)
|
actionview (= 4.2.4)
|
||||||
activesupport (= 4.0.4)
|
activejob (= 4.2.4)
|
||||||
|
activemodel (= 4.2.4)
|
||||||
|
activerecord (= 4.2.4)
|
||||||
|
activesupport (= 4.2.4)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.0.4)
|
railties (= 4.2.4)
|
||||||
sprockets-rails (~> 2.0.0)
|
sprockets-rails
|
||||||
railties (4.0.4)
|
rails-deprecated_sanitizer (1.0.3)
|
||||||
actionpack (= 4.0.4)
|
activesupport (>= 4.2.0.alpha)
|
||||||
activesupport (= 4.0.4)
|
rails-dom-testing (1.0.7)
|
||||||
|
activesupport (>= 4.2.0.beta, < 5.0)
|
||||||
|
nokogiri (~> 1.6.0)
|
||||||
|
rails-deprecated_sanitizer (>= 1.0.1)
|
||||||
|
rails-html-sanitizer (1.0.2)
|
||||||
|
loofah (~> 2.0)
|
||||||
|
railties (4.2.4)
|
||||||
|
actionpack (= 4.2.4)
|
||||||
|
activesupport (= 4.2.4)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (10.2.2)
|
rake (10.4.2)
|
||||||
ref (1.0.5)
|
ref (2.0.0)
|
||||||
sass (3.3.4)
|
responders (2.1.0)
|
||||||
sass-rails (4.0.1)
|
railties (>= 4.2.0, < 5)
|
||||||
|
sass (3.4.18)
|
||||||
|
sass-rails (5.0.4)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (>= 3.1.10)
|
sass (~> 3.1)
|
||||||
sprockets-rails (~> 2.0.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
|
sprockets-rails (>= 2.0, < 4.0)
|
||||||
|
tilt (>= 1.1, < 3)
|
||||||
sprockets (2.11.0)
|
sprockets (2.11.0)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
tilt (~> 1.1, != 1.3.0)
|
tilt (~> 1.1, != 1.3.0)
|
||||||
sprockets-rails (2.0.1)
|
sprockets-rails (2.3.2)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (~> 2.8)
|
sprockets (>= 2.8, < 4.0)
|
||||||
therubyracer (0.12.1)
|
therubyracer (0.12.2)
|
||||||
libv8 (~> 3.16.14.0)
|
libv8 (~> 3.16.14.0)
|
||||||
ref
|
ref
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.2)
|
thread_safe (0.3.5)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
treetop (1.4.15)
|
tzinfo (1.2.2)
|
||||||
polyglot
|
thread_safe (~> 0.1)
|
||||||
polyglot (>= 0.3.1)
|
uglifier (2.7.2)
|
||||||
tzinfo (0.3.39)
|
|
||||||
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)
|
||||||
|
|
@ -139,8 +170,11 @@ DEPENDENCIES
|
||||||
mail
|
mail
|
||||||
mina
|
mina
|
||||||
pg
|
pg
|
||||||
rails (= 4.0.4)
|
rails (= 4.2.4)
|
||||||
sass-rails
|
sass-rails
|
||||||
sprockets (= 2.11.0)
|
sprockets (= 2.11.0)
|
||||||
therubyracer
|
therubyracer
|
||||||
uglifier
|
uglifier
|
||||||
|
|
||||||
|
BUNDLED WITH
|
||||||
|
1.10.6
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue