nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump rails

Browse source
This commit is contained in:
Jonne Haß 2014-09-12 21:49:09 +02:00
parent d5474c3992
commit 9f125058f7
2 changed files with 30 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -1,7 +1,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
source 'https://rails-assets.org' source 'https://rails-assets.org'
gem 'rails', '4.1.5' gem 'rails', '4.1.6'
# Legacy Rails features, remove me! # Legacy Rails features, remove me!

63
Gemfile.lock
View file

@ -2,29 +2,29 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
remote: https://rails-assets.org/ remote: https://rails-assets.org/
specs: specs:
actionmailer (4.1.5) actionmailer (4.1.6)
actionpack (= 4.1.5) actionpack (= 4.1.6)
actionview (= 4.1.5) actionview (= 4.1.6)
mail (~> 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.5) actionpack (4.1.6)
actionview (= 4.1.5) actionview (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionpack-action_caching (1.1.1) actionpack-action_caching (1.1.1)
actionpack (>= 4.0.0, < 5.0) actionpack (>= 4.0.0, < 5.0)
actionpack-page_caching (1.0.2) actionpack-page_caching (1.0.2)
actionpack (>= 4.0.0, < 5) actionpack (>= 4.0.0, < 5)
actionview (4.1.5) actionview (4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.5) activemodel (4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.5) activerecord (4.1.6)
activemodel (= 4.1.5) activemodel (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
arel (~> 5.0.0) arel (~> 5.0.0)
activerecord-import (0.5.0) activerecord-import (0.5.0)
activerecord (>= 3.0) activerecord (>= 3.0)
@ -32,7 +32,7 @@ GEM
activemodel (~> 4.0) activemodel (~> 4.0)
activesupport (~> 4.0) activesupport (~> 4.0)
rails-observers (~> 0.1.1) rails-observers (~> 0.1.1)
activesupport (4.1.5) activesupport (4.1.6)
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)
@ -254,9 +254,8 @@ GEM
lumberjack (1.0.9) lumberjack (1.0.9)
macaddr (1.7.1) macaddr (1.7.1)
systemu (~> 2.6.2) systemu (~> 2.6.2)
mail (2.5.4) mail (2.6.1)
mime-types (~> 1.16) mime-types (>= 1.16, < 3)
treetop (~> 1.4.8)
markerb (1.0.2) markerb (1.0.2)
redcarpet (>= 2.0) redcarpet (>= 2.0)
messagebus_ruby_api (1.0.3) messagebus_ruby_api (1.0.3)
@ -312,7 +311,6 @@ GEM
nokogiri nokogiri
orm_adapter (0.5.0) orm_adapter (0.5.0)
phantomjs (1.9.7.1) phantomjs (1.9.7.1)
polyglot (0.3.5)
pry (0.10.1) pry (0.10.1)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
@ -335,15 +333,15 @@ GEM
rack rack
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.5) rails (4.1.6)
actionmailer (= 4.1.5) actionmailer (= 4.1.6)
actionpack (= 4.1.5) actionpack (= 4.1.6)
actionview (= 4.1.5) actionview (= 4.1.6)
activemodel (= 4.1.5) activemodel (= 4.1.6)
activerecord (= 4.1.5) activerecord (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.5) railties (= 4.1.6)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
rails-assets-jquery (1.11.1) rails-assets-jquery (1.11.1)
rails-assets-perfect-scrollbar (0.4.11) rails-assets-perfect-scrollbar (0.4.11)
@ -372,9 +370,9 @@ GEM
sass-rails (~> 4.0) sass-rails (~> 4.0)
rails_autolink (1.1.6) rails_autolink (1.1.6)
rails (> 3.1) rails (> 3.1)
railties (4.1.5) railties (4.1.6)
actionpack (= 4.1.5) actionpack (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
raindrops (0.13.0) raindrops (0.13.0)
@ -464,9 +462,6 @@ GEM
timecop (0.7.1) timecop (0.7.1)
timers (4.0.0) timers (4.0.0)
hitimes hitimes
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
twitter (4.8.1) twitter (4.8.1)
faraday (~> 0.8, < 0.10) faraday (~> 0.8, < 0.10)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -560,7 +555,7 @@ DEPENDENCIES
rack-protection (= 1.2) rack-protection (= 1.2)
rack-rewrite (= 1.5.0) rack-rewrite (= 1.5.0)
rack-ssl (= 1.4.1) rack-ssl (= 1.4.1)
rails (= 4.1.5) rails (= 4.1.6)
rails-assets-jquery (= 1.11.1) rails-assets-jquery (= 1.11.1)
rails-assets-perfect-scrollbar (= 0.4.11) rails-assets-perfect-scrollbar (= 0.4.11)
rails-i18n (= 4.0.3) rails-i18n (= 4.0.3)