Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update rails to 4.0.5

This commit is contained in:
Alexander Machehin 2014-05-07 12:33:41 +06:00
parent 47943182e6
commit 9795f3b5bc
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '4.0.4' gem 'rails', '4.0.5'
gem 'activeadmin', github: 'gregbell/active_admin' gem 'activeadmin', github: 'gregbell/active_admin'
gem 'pg', '~> 0.17.1' gem 'pg', '~> 0.17.1'

50
Gemfile.lock
View File

@ -52,25 +52,25 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
RedCloth (4.2.9) RedCloth (4.2.9)
actionmailer (4.0.4) actionmailer (4.0.5)
actionpack (= 4.0.4) actionpack (= 4.0.5)
mail (~> 2.5.4) mail (~> 2.5.4)
actionpack (4.0.4) actionpack (4.0.5)
activesupport (= 4.0.4) activesupport (= 4.0.5)
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.4) activemodel (4.0.5)
activesupport (= 4.0.4) activesupport (= 4.0.5)
builder (~> 3.1.0) builder (~> 3.1.0)
activerecord (4.0.4) activerecord (4.0.5)
activemodel (= 4.0.4) activemodel (= 4.0.5)
activerecord-deprecated_finders (~> 1.0.2) activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.4) activesupport (= 4.0.5)
arel (~> 4.0.0) arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3) activerecord-deprecated_finders (1.0.3)
activesupport (4.0.4) activesupport (4.0.5)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2) minitest (~> 4.2)
multi_json (~> 1.3) multi_json (~> 1.3)
@ -86,7 +86,6 @@ GEM
arbre (1.0.1) arbre (1.0.1)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
arel (4.0.2) arel (4.0.2)
atomic (1.1.16)
attr_encrypted (1.3.2) attr_encrypted (1.3.2)
encryptor (>= 1.3.0) encryptor (>= 1.3.0)
bcrypt (3.1.7) bcrypt (3.1.7)
@ -259,7 +258,7 @@ GEM
momentjs-rails (2.5.1) momentjs-rails (2.5.1)
railties (>= 3.1) railties (>= 3.1)
mono_logger (1.1.0) mono_logger (1.1.0)
multi_json (1.9.0) multi_json (1.10.0)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
nest (1.1.2) nest (1.1.2)
@ -330,24 +329,24 @@ GEM
rack (>= 1.0) rack (>= 1.0)
rack-throttle (0.3.0) rack-throttle (0.3.0)
rack (>= 1.0.0) rack (>= 1.0.0)
rails (4.0.4) rails (4.0.5)
actionmailer (= 4.0.4) actionmailer (= 4.0.5)
actionpack (= 4.0.4) actionpack (= 4.0.5)
activerecord (= 4.0.4) activerecord (= 4.0.5)
activesupport (= 4.0.4) activesupport (= 4.0.5)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.0.4) railties (= 4.0.5)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0.0)
rails3-generators (1.0.0) rails3-generators (1.0.0)
railties (>= 3.0.0) railties (>= 3.0.0)
rails3-jquery-autocomplete (1.0.12) rails3-jquery-autocomplete (1.0.12)
rails (>= 3.0) rails (>= 3.0)
railties (4.0.4) railties (4.0.5)
actionpack (= 4.0.4) actionpack (= 4.0.5)
activesupport (= 4.0.4) activesupport (= 4.0.5)
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.3.1)
ransack (1.2.1) ransack (1.2.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activerecord (>= 3.0) activerecord (>= 3.0)
@ -473,9 +472,8 @@ GEM
daemons (>= 1.0.9) daemons (>= 1.0.9)
eventmachine (>= 0.12.6) eventmachine (>= 0.12.6)
rack (>= 1.0.0) rack (>= 1.0.0)
thor (0.18.1) thor (0.19.1)
thread_safe (0.2.0) thread_safe (0.3.3)
atomic (>= 1.1.7, < 2)
tilt (1.4.1) tilt (1.4.1)
time_diff (0.3.0) time_diff (0.3.0)
activesupport activesupport
@ -567,7 +565,7 @@ DEPENDENCIES
protected_attributes protected_attributes
puma puma
rack-throttle (~> 0.3.0) rack-throttle (~> 0.3.0)
rails (= 4.0.4) rails (= 4.0.5)
rails3-generators rails3-generators
rails3-jquery-autocomplete (~> 1.0) rails3-jquery-autocomplete (~> 1.0)
rake rake