Moved to rails 4.1.13.
This commit is contained in:
Martin Edenhofer
parent
a177be617f
commit
1c8b9dabdc
2 changed files with 32 additions and 32 deletions
2
Gemfile
2
Gemfile
|
|
@ -1,6 +1,6 @@
|
||||||
source 'http://rubygems.org'
|
source 'http://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '4.1.10'
|
gem 'rails', '4.1.13'
|
||||||
gem 'rails-observers'
|
gem 'rails-observers'
|
||||||
gem 'activerecord-session_store'
|
gem 'activerecord-session_store'
|
||||||
|
|
||||||
|
|
|
||||||
62
Gemfile.lock
62
Gemfile.lock
|
|
@ -1,31 +1,31 @@
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.1.10)
|
actionmailer (4.1.13)
|
||||||
actionpack (= 4.1.10)
|
actionpack (= 4.1.13)
|
||||||
actionview (= 4.1.10)
|
actionview (= 4.1.13)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
actionpack (4.1.10)
|
actionpack (4.1.13)
|
||||||
actionview (= 4.1.10)
|
actionview (= 4.1.13)
|
||||||
activesupport (= 4.1.10)
|
activesupport (= 4.1.13)
|
||||||
rack (~> 1.5.2)
|
rack (~> 1.5.2)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
actionview (4.1.10)
|
actionview (4.1.13)
|
||||||
activesupport (= 4.1.10)
|
activesupport (= 4.1.13)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
activemodel (4.1.10)
|
activemodel (4.1.13)
|
||||||
activesupport (= 4.1.10)
|
activesupport (= 4.1.13)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.1.10)
|
activerecord (4.1.13)
|
||||||
activemodel (= 4.1.10)
|
activemodel (= 4.1.13)
|
||||||
activesupport (= 4.1.10)
|
activesupport (= 4.1.13)
|
||||||
arel (~> 5.0.0)
|
arel (~> 5.0.0)
|
||||||
activerecord-session_store (0.1.1)
|
activerecord-session_store (0.1.1)
|
||||||
actionpack (>= 4.0.0, < 5)
|
actionpack (>= 4.0.0, < 5)
|
||||||
activerecord (>= 4.0.0, < 5)
|
activerecord (>= 4.0.0, < 5)
|
||||||
railties (>= 4.0.0, < 5)
|
railties (>= 4.0.0, < 5)
|
||||||
activesupport (4.1.10)
|
activesupport (4.1.13)
|
||||||
i18n (~> 0.6, >= 0.6.9)
|
i18n (~> 0.6, >= 0.6.9)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
|
|
@ -36,10 +36,10 @@ GEM
|
||||||
ast (2.1.0)
|
ast (2.1.0)
|
||||||
astrolabe (1.3.1)
|
astrolabe (1.3.1)
|
||||||
parser (~> 2.2)
|
parser (~> 2.2)
|
||||||
autoprefixer-rails (5.2.1.2)
|
autoprefixer-rails (5.2.1.3)
|
||||||
execjs
|
execjs
|
||||||
json
|
json
|
||||||
browser (0.9.1)
|
browser (1.0.1)
|
||||||
buftok (0.2.0)
|
buftok (0.2.0)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
childprocess (0.5.6)
|
childprocess (0.5.6)
|
||||||
|
|
@ -117,7 +117,7 @@ GEM
|
||||||
multi_json (1.11.2)
|
multi_json (1.11.2)
|
||||||
multi_xml (0.5.5)
|
multi_xml (0.5.5)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
mysql2 (0.3.19)
|
mysql2 (0.3.20)
|
||||||
naught (1.0.0)
|
naught (1.0.0)
|
||||||
nenv (0.2.0)
|
nenv (0.2.0)
|
||||||
net-ldap (0.11)
|
net-ldap (0.11)
|
||||||
|
|
@ -165,21 +165,21 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.1.10)
|
rails (4.1.13)
|
||||||
actionmailer (= 4.1.10)
|
actionmailer (= 4.1.13)
|
||||||
actionpack (= 4.1.10)
|
actionpack (= 4.1.13)
|
||||||
actionview (= 4.1.10)
|
actionview (= 4.1.13)
|
||||||
activemodel (= 4.1.10)
|
activemodel (= 4.1.13)
|
||||||
activerecord (= 4.1.10)
|
activerecord (= 4.1.13)
|
||||||
activesupport (= 4.1.10)
|
activesupport (= 4.1.13)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.1.10)
|
railties (= 4.1.13)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (~> 2.0)
|
||||||
rails-observers (0.1.2)
|
rails-observers (0.1.2)
|
||||||
activemodel (~> 4.0)
|
activemodel (~> 4.0)
|
||||||
railties (4.1.10)
|
railties (4.1.13)
|
||||||
actionpack (= 4.1.10)
|
actionpack (= 4.1.13)
|
||||||
activesupport (= 4.1.10)
|
activesupport (= 4.1.13)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rainbow (2.0.0)
|
rainbow (2.0.0)
|
||||||
|
|
@ -196,7 +196,7 @@ GEM
|
||||||
ruby-progressbar (~> 1.4)
|
ruby-progressbar (~> 1.4)
|
||||||
ruby-progressbar (1.7.5)
|
ruby-progressbar (1.7.5)
|
||||||
rubyzip (1.1.7)
|
rubyzip (1.1.7)
|
||||||
sass (3.4.16)
|
sass (3.4.18)
|
||||||
sass-rails (5.0.3)
|
sass-rails (5.0.3)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (~> 3.1)
|
sass (~> 3.1)
|
||||||
|
|
@ -254,7 +254,7 @@ GEM
|
||||||
simple_oauth (~> 0.3.0)
|
simple_oauth (~> 0.3.0)
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.7.1)
|
uglifier (2.7.2)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
json (>= 1.8.0)
|
json (>= 1.8.0)
|
||||||
websocket (1.2.2)
|
websocket (1.2.2)
|
||||||
|
|
@ -292,7 +292,7 @@ DEPENDENCIES
|
||||||
omniauth-twitter
|
omniauth-twitter
|
||||||
puma
|
puma
|
||||||
rack-livereload
|
rack-livereload
|
||||||
rails (= 4.1.10)
|
rails (= 4.1.13)
|
||||||
rails-observers
|
rails-observers
|
||||||
rb-fsevent
|
rb-fsevent
|
||||||
rubocop
|
rubocop
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue