playground
/
entrydns
mirror of https://github.com/EntryDNS/entrydns.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

update rails and other deps

pull/1/head
Nicolae Claudius 11 years ago
parent
a36d449390
commit
b43339bf77
2 changed files with 40 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Gemfile
  2. 78
      Gemfile.lock

2
Gemfile
Unescape View File

@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '4.0.0' gem 'rails', '4.0.1'
gem 'mysql2', '~> 0.3.13' gem 'mysql2', '~> 0.3.13'
gem 'devise', '~> 3.0.3' gem 'devise', '~> 3.0.3'
gem 'cancan', '= 1.6.7' gem 'cancan', '= 1.6.7'

78
Gemfile.lock
Unescape View File

@ -6,7 +6,7 @@ GIT
GIT GIT
remote: git://github.com/activescaffold/active_scaffold.git remote: git://github.com/activescaffold/active_scaffold.git
revision: 34cd6608c059c1816e68cb7b8c22c5bf1d04891f revision: 37429d94300c07d5c2b27a0d41d01572c2313236
specs: specs:
active_scaffold (3.4.0.rc) active_scaffold (3.4.0.rc)
rails (>= 3.2.6, < 5) rails (>= 3.2.6, < 5)
@ -41,7 +41,7 @@ GIT
GIT GIT
remote: git://github.com/plataformatec/simple_form.git remote: git://github.com/plataformatec/simple_form.git
revision: 50c4ac4a8bd0cb883ddaa309b779978e4207fef4 revision: 146cff7ec6bdaba00201b73704f3417a7b978e31
specs: specs:
simple_form (3.0.0) simple_form (3.0.0)
actionpack (>= 4.0.0, < 4.1) actionpack (>= 4.0.0, < 4.1)
@ -49,7 +49,7 @@ GIT
GIT GIT
remote: git://github.com/thomas-mcdonald/bootstrap-sass.git remote: git://github.com/thomas-mcdonald/bootstrap-sass.git
revision: 0e88056ac5d58fb0bbd23d3fe929eac01712d964 revision: 9c6c07f74ff515cf38380b014cfede14a4f0eae4
branch: 3 branch: 3
specs: specs:
bootstrap-sass (3.0.0.0) bootstrap-sass (3.0.0.0)
@ -58,11 +58,11 @@ GIT
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (4.0.0) actionmailer (4.0.1)
actionpack (= 4.0.0) actionpack (= 4.0.1)
mail (~> 2.5.3) mail (~> 2.5.4)
actionpack (4.0.0) actionpack (4.0.1)
activesupport (= 4.0.0) activesupport (= 4.0.1)
builder (~> 3.1.0) builder (~> 3.1.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rack (~> 1.5.2) rack (~> 1.5.2)
@ -70,16 +70,16 @@ GEM
active-model-email-validator (1.0.2) active-model-email-validator (1.0.2)
activemodel activemodel
mail mail
activemodel (4.0.0) activemodel (4.0.1)
activesupport (= 4.0.0) activesupport (= 4.0.1)
builder (~> 3.1.0) builder (~> 3.1.0)
activerecord (4.0.0) activerecord (4.0.1)
activemodel (= 4.0.0) activemodel (= 4.0.1)
activerecord-deprecated_finders (~> 1.0.2) activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0) activesupport (= 4.0.1)
arel (~> 4.0.0) arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3) activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0) activesupport (4.0.1)
i18n (~> 0.6, >= 0.6.4) i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2) minitest (~> 4.2)
multi_json (~> 1.3) multi_json (~> 1.3)
@ -87,9 +87,9 @@ GEM
tzinfo (~> 0.3.37) tzinfo (~> 0.3.37)
acts_as_nested_interval (0.1.0) acts_as_nested_interval (0.1.0)
rails (>= 3.2.1, < 5) rails (>= 3.2.1, < 5)
animate-rails (1.0.1) animate-rails (1.0.3)
rails rails
arel (4.0.0) arel (4.0.1)
atomic (1.1.14) atomic (1.1.14)
bcrypt-ruby (3.1.2) bcrypt-ruby (3.1.2)
better_errors (1.0.1) better_errors (1.0.1)
@ -105,11 +105,11 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
chunky_png (1.2.8) chunky_png (1.2.9)
coderay (1.1.0) coderay (1.1.0)
coffee-rails (4.0.0) coffee-rails (4.0.1)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0.beta, < 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
@ -152,14 +152,14 @@ GEM
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (4.0.5) jquery-ui-rails (4.0.5)
railties (>= 3.1.0) railties (>= 3.1.0)
json (1.8.0) json (1.8.1)
kgio (2.8.1) kgio (2.8.1)
libv8 (3.16.14.3) libv8 (3.16.14.3)
mail (2.5.4) mail (2.5.4)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
mime-types (1.25) mime-types (1.25)
mini_portile (0.5.1) mini_portile (0.5.2)
minitest (4.7.5) minitest (4.7.5)
multi_json (1.8.2) multi_json (1.8.2)
mysql2 (0.3.13) mysql2 (0.3.13)
@ -180,30 +180,30 @@ GEM
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.0) rails (4.0.1)
actionmailer (= 4.0.0) actionmailer (= 4.0.1)
actionpack (= 4.0.0) actionpack (= 4.0.1)
activerecord (= 4.0.0) activerecord (= 4.0.1)
activesupport (= 4.0.0) activesupport (= 4.0.1)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0) railties (= 4.0.1)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0.0)
rails-settings-cached (0.3.1) rails-settings-cached (0.3.2)
rails (>= 4.0.0.beta1) rails (>= 4.0.0)
rails_config (0.3.3) rails_config (0.3.3)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (4.0.0) railties (4.0.1)
actionpack (= 4.0.0) actionpack (= 4.0.1)
activesupport (= 4.0.0) activesupport (= 4.0.1)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
raindrops (0.12.0) raindrops (0.12.0)
rake (10.1.0) rake (10.1.0)
ref (1.0.5) ref (1.0.5)
rspec-core (2.14.5) rspec-core (2.14.7)
rspec-expectations (2.14.3) rspec-expectations (2.14.3)
diff-lcs (>= 1.1.3, < 2.0) diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.3) rspec-mocks (2.14.4)
rspec-rails (2.14.0) rspec-rails (2.14.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
@ -214,8 +214,8 @@ GEM
ruby-debug-ide (0.4.18) ruby-debug-ide (0.4.18)
rake (>= 0.8.1) rake (>= 0.8.1)
sass (3.2.12) sass (3.2.12)
sass-rails (4.0.0) sass-rails (4.0.1)
railties (>= 4.0.0.beta, < 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)
sentient_model (1.0.4) sentient_model (1.0.4)
@ -225,7 +225,7 @@ GEM
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.0) sprockets-rails (2.0.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (~> 2.8) sprockets (~> 2.8)
@ -256,7 +256,7 @@ GEM
raindrops (~> 0.7) raindrops (~> 0.7)
warden (1.2.3) warden (1.2.3)
rack (>= 1.0) rack (>= 1.0)
webshims-rails (1.11.1) webshims-rails (1.11.2)
rails (> 3.1.0) rails (> 3.1.0)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
@ -294,7 +294,7 @@ DEPENDENCIES
nprogress-rails (~> 0.1.2.2) nprogress-rails (~> 0.1.2.2)
oily_png (~> 1.1.0) oily_png (~> 1.1.0)
quiet_assets (~> 1.0.1) quiet_assets (~> 1.0.1)
rails (= 4.0.0) rails (= 4.0.1)
rails-settings-cached (~> 0.3.1) rails-settings-cached (~> 0.3.1)
rails_config (~> 0.3.3) rails_config (~> 0.3.3)
rspec-rails (~> 2.14.0) rspec-rails (~> 2.14.0)

Write Preview
Loading…
Cancel
Save