Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Commit

Permalink
Rails 4.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@nning
nning committed Apr 9, 2014
1 parent 7ed3c38 commit f4eafa7
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 80 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '~> 4.0.2'
gem 'rails', '~> 4.1.0'

gem 'pg', platforms: :ruby
gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
Expand Down
163 changes: 84 additions & 79 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ GIT

GIT
remote: git://github.com/plataformatec/devise-encryptable.git
revision: 803d30fb267f3be9fa626c8a93d9a893acc931a0
revision: 9b1e3efefdb1ba913f684b390e7a4a57b35074d4
specs:
devise-encryptable (0.1.2)
devise (>= 2.1.0)

GIT
remote: git://github.com/plataformatec/devise.git
revision: 4995d3c2215e9e98a24acc7d7490aa2c57ba119c
revision: b0b18fb80508ae37a7460e1f6d1064adf9593cce
specs:
devise (3.2.3)
devise (3.2.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
Expand All @@ -39,65 +39,66 @@ GIT

GIT
remote: git://github.com/plataformatec/simple_form.git
revision: 32019827798eddbecc19676d69eb406a4f3902cc
revision: 6b3f9db8906336d8df80475c71b75613e3fc895b
specs:
simple_form (3.0.1)
actionpack (>= 4.0.0, < 4.1)
activemodel (>= 4.0.0, < 4.1)
actionpack (~> 4.0)
activemodel (~> 4.0)

GIT
remote: git://github.com/rails/sass-rails.git
revision: 6d4e551a114a7e3458ce3cb1edb39da07935919e
revision: a5c466c809cde1797f5cc4b447f3a73f1fcb911f
specs:
sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0)
sass (>= 3.2.0)
sprockets-rails (~> 2.0.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)

GIT
remote: git://github.com/thomas-mcdonald/bootstrap-sass.git
revision: 3ad23084e3526f5c2dbf066a173f1c9df45bc94e
revision: 44d139e896a2bc1bd623f9cbcb714465ff3ed11f
specs:
bootstrap-sass (3.1.1.0)
sass (~> 3.2)

GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.3)
actionpack (= 4.0.3)
actionmailer (4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
mail (~> 2.5.4)
actionpack (4.0.3)
activesupport (= 4.0.3)
builder (~> 3.1.0)
erubis (~> 2.7.0)
actionpack (4.1.0)
actionview (= 4.1.0)
activesupport (= 4.1.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.3)
activesupport (= 4.0.3)
builder (~> 3.1.0)
activerecord (4.0.3)
activemodel (= 4.0.3)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.3)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.3)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
actionview (4.1.0)
activesupport (= 4.1.0)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.0)
activesupport (= 4.1.0)
builder (~> 3.1)
activerecord (4.1.0)
activemodel (= 4.1.0)
activesupport (= 4.1.0)
arel (~> 5.0.0)
activesupport (4.1.0)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
ansi (1.4.3)
arel (4.0.2)
atomic (1.1.14)
tzinfo (~> 1.1)
arel (5.0.0)
bcrypt (3.1.7)
better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
brakeman (2.4.1)
brakeman (2.4.3)
erubis (~> 2.6)
fastercsv (~> 1.5)
haml (>= 3.0, < 5.0)
Expand All @@ -108,7 +109,7 @@ GEM
sass (~> 3.0)
slim (>= 1.3.6, < 3.0)
terminal-table (~> 1.4)
builder (3.1.4)
builder (3.2.2)
cancan (1.6.10)
capistrano (3.1.0)
i18n
Expand Down Expand Up @@ -139,15 +140,25 @@ GEM
default_value_for (3.0.0)
activerecord (>= 3.2.0, < 5.0)
docile (1.1.3)
elasticsearch (0.4.11)
elasticsearch-api (= 0.4.11)
elasticsearch-transport (= 0.4.11)
elasticsearch-api (0.4.11)
multi_json
elasticsearch-transport (0.4.11)
faraday
multi_json
erubis (2.7.0)
execjs (2.0.2)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.0)
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
railties (>= 3.0.0)
faker (1.2.0)
faker (1.3.0)
i18n (~> 0.5)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
fastercsv (1.5.5)
foreigner (1.6.1)
activerecord (>= 3.0.0)
Expand All @@ -156,8 +167,8 @@ GEM
has_scope (0.6.0.rc)
actionpack (>= 3.2, < 5)
activesupport (>= 3.2, < 5)
hashr (0.0.22)
highline (1.6.20)
hashie (2.1.0)
highline (1.6.21)
hike (1.2.3)
i18n (0.6.9)
inherited_resources (1.4.1)
Expand All @@ -175,8 +186,9 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
minitest (4.7.5)
multi_json (1.8.4)
minitest (5.3.2)
multi_json (1.9.2)
multipart-post (2.0.0)
mysql2 (0.3.15)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
Expand All @@ -189,27 +201,29 @@ GEM
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.3)
actionmailer (= 4.0.3)
actionpack (= 4.0.3)
activerecord (= 4.0.3)
activesupport (= 4.0.3)
rails (4.1.0)
actionmailer (= 4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
activemodel (= 4.1.0)
activerecord (= 4.1.0)
activesupport (= 4.1.0)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.3)
sprockets-rails (~> 2.0.0)
railties (= 4.1.0)
sprockets-rails (~> 2.0)
rails-erd (1.1.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
choice (~> 0.1.6)
ruby-graphviz (~> 1.0.4)
rails_config (0.3.3)
activesupport (>= 3.0)
railties (4.0.3)
actionpack (= 4.0.3)
activesupport (= 4.0.3)
railties (4.1.0)
actionpack (= 4.1.0)
activesupport (= 4.1.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.1)
rake (10.2.2)
rdoc (4.1.1)
json (~> 1.4)
ref (1.0.5)
Expand All @@ -218,23 +232,24 @@ GEM
rest-client (1.6.7)
mime-types (>= 1.16)
ruby-graphviz (1.0.9)
ruby2ruby (2.0.7)
ruby2ruby (2.0.8)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
ruby_parser (3.4.1)
sexp_processor (~> 4.1)
sass (3.2.14)
sass (3.2.19)
sdoc (0.4.0)
json (~> 1.8)
rdoc (~> 4.0, < 5.0)
searchkick (0.5.2)
tire
tire-contrib
sexp_processor (4.4.1)
searchkick (0.6.3)
activemodel
elasticsearch (~> 0.4.11)
hashie
sexp_processor (4.4.3)
shoulda (3.5.0)
shoulda-context (~> 1.0, >= 1.0.1)
shoulda-matchers (>= 1.4.1, < 3.0)
shoulda-context (1.1.6)
shoulda-context (1.2.1)
shoulda-matchers (2.4.0)
activesupport (>= 3.0.0)
simplecov (0.8.2)
Expand All @@ -250,11 +265,11 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1)
sprockets-rails (2.1.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.8)
sqlite3 (1.3.9)
sshkit (1.3.0)
net-scp (>= 1.1.2)
net-ssh
Expand All @@ -266,28 +281,18 @@ GEM
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
thor (0.18.1)
thread_safe (0.1.3)
atomic
thor (0.19.1)
thread_safe (0.3.3)
tilt (1.4.1)
tins (1.0.0)
tire (0.6.2)
activemodel (>= 3.0)
activesupport
ansi
hashr (~> 0.0.19)
multi_json (~> 1.3)
rake
rest-client (~> 1.6)
tire-contrib (0.1.3)
tire
tins (1.1.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks (2.2.1)
turbolinks (2.2.2)
coffee-rails
tzinfo (0.3.38)
uglifier (2.4.0)
tzinfo (1.1.0)
thread_safe (~> 0.1)
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)

Expand Down Expand Up @@ -324,7 +329,7 @@ DEPENDENCIES
mysql2
paper_trail (= 3.0.0.beta1)
pg
rails (~> 4.0.2)
rails (~> 4.1.0)
rails-erd
rails_config
rake
Expand Down

0 comments on commit f4eafa7

Please sign in to comment.