Skip to content

Commit

Permalink
Merge pull request #69 from hcarreras/rails_4_0_3
Browse files Browse the repository at this point in the history
Rails 4 0 3
  • Loading branch information
voodoorai2000 committed Feb 25, 2014
2 parents 94e8e40 + 2f9e99c commit 2cce13b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions Gemfile
@@ -1,7 +1,7 @@
source 'http://rubygems.org'
ruby '2.0.0'

gem 'rails', "~> 4.0.2"
gem 'rails', "~> 4.0.3"

gem 'mechanize'
gem 'inherited_resources', github: "josevalim/inherited_resources"
Expand Down Expand Up @@ -29,7 +29,7 @@ gem 'coffee-rails'
gem 'uglifier'
gem 'bootstrap-sass'

gem 'jquery-rails'
gem 'jquery-rails'

#Image manipulation
gem "carrierwave"
Expand Down
46 changes: 23 additions & 23 deletions Gemfile.lock
Expand Up @@ -9,32 +9,32 @@ GIT
GEM
remote: http://rubygems.org/
specs:
actionmailer (4.0.2)
actionpack (= 4.0.2)
actionmailer (4.0.3)
actionpack (= 4.0.3)
mail (~> 2.5.4)
actionpack (4.0.2)
activesupport (= 4.0.2)
actionpack (4.0.3)
activesupport (= 4.0.3)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.2)
activesupport (= 4.0.2)
activemodel (4.0.3)
activesupport (= 4.0.3)
builder (~> 3.1.0)
activerecord (4.0.2)
activemodel (= 4.0.2)
activerecord (4.0.3)
activemodel (= 4.0.3)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.2)
activesupport (= 4.0.3)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.2)
activesupport (4.0.3)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
addressable (2.3.5)
arel (4.0.1)
arel (4.0.2)
atomic (1.1.14)
bcrypt-ruby (3.1.2)
bootstrap-sass (3.0.3.0)
Expand Down Expand Up @@ -174,19 +174,19 @@ GEM
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
polyglot (0.3.3)
polyglot (0.3.4)
rack (1.5.2)
rack-cache (1.2)
rack (>= 0.4)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.2)
actionmailer (= 4.0.2)
actionpack (= 4.0.2)
activerecord (= 4.0.2)
activesupport (= 4.0.2)
rails (4.0.3)
actionmailer (= 4.0.3)
actionpack (= 4.0.3)
activerecord (= 4.0.3)
activesupport (= 4.0.3)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.2)
railties (= 4.0.3)
sprockets-rails (~> 2.0.0)
rails_12factor (0.0.2)
rails_serve_static_assets
Expand All @@ -195,9 +195,9 @@ GEM
rails (> 3.1)
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (4.0.2)
actionpack (= 4.0.2)
activesupport (= 4.0.2)
railties (4.0.3)
actionpack (= 4.0.3)
activesupport (= 4.0.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.12.0)
Expand Down Expand Up @@ -233,7 +233,7 @@ GEM
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
sprockets (2.10.1)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand Down Expand Up @@ -312,7 +312,7 @@ DEPENDENCIES
pg
poltergeist
rack-cache
rails (~> 4.0.2)
rails (~> 4.0.3)
rails_12factor
rails_autolink
rmagick
Expand Down

0 comments on commit 2cce13b

Please sign in to comment.