Browse Source

Migration to rails 4.1.1

recurrent
echarp 8 years ago
parent
commit
85d4f16621
  1. 73
      Gemfile.lock
  2. 3
      config/initializers/mime_types.rb

73
Gemfile.lock

@ -7,7 +7,7 @@ GIT
GIT
remote: git://github.com/activerecord-hackery/ransack.git
revision: 2b142d9e78afe299a64cfa6921245f478c5c01c7
revision: a4b7be58eb6d6dcff5082d7c945f3d08fe4ec263
branch: rails-4.1
specs:
ransack (1.2.4)
@ -26,25 +26,24 @@ GIT
GIT
remote: git://github.com/gregbell/active_admin.git
revision: 5d1bbbb136280d305bf79da82ab5c986b2979325
revision: ad33a0f6c772e74a23232baa7db0b3db2fe19db2
specs:
activeadmin (1.0.0.pre)
arbre (~> 1.0)
bourbon
coffee-rails
devise (~> 3.2)
formtastic (~> 2.3.0.rc3)
inherited_resources (~> 1.3)
jquery-rails
jquery-ui-rails
kaminari (~> 0.15)
rails (>= 3.2, <= 4.1)
rails (>= 3.2, < 4.2)
ransack (~> 1.0)
sass-rails
GIT
remote: git://github.com/justinfrench/formtastic.git
revision: 16a528a37d84f6c51ddbf196597e9472abc4e255
revision: 1bdf6d3642af52a1a62902f12b844a5856d0254e
specs:
formtastic (2.3.0.rc3)
actionpack (>= 3.2.13)
@ -59,27 +58,27 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.0)
actionpack (= 4.1.0)
actionview (= 4.1.0)
actionmailer (4.1.1)
actionpack (= 4.1.1)
actionview (= 4.1.1)
mail (~> 2.5.4)
actionpack (4.1.0)
actionview (= 4.1.0)
activesupport (= 4.1.0)
actionpack (4.1.1)
actionview (= 4.1.1)
activesupport (= 4.1.1)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.0)
activesupport (= 4.1.0)
actionview (4.1.1)
activesupport (= 4.1.1)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.0)
activesupport (= 4.1.0)
activemodel (4.1.1)
activesupport (= 4.1.1)
builder (~> 3.1)
activerecord (4.1.0)
activemodel (= 4.1.0)
activesupport (= 4.1.0)
activerecord (4.1.1)
activemodel (= 4.1.1)
activesupport (= 4.1.1)
arel (~> 5.0.0)
activesupport (4.1.0)
activesupport (4.1.1)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -88,7 +87,6 @@ GEM
arbre (1.0.1)
activesupport (>= 3.0.0)
arel (5.0.1.20140414130214)
bcrypt (3.1.7)
bourbon (3.2.1)
sass (~> 3.2)
thor
@ -114,12 +112,6 @@ GEM
compass-rails (1.1.7)
compass (>= 0.12.2)
sprockets (<= 2.11.0)
devise (3.2.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-i18n (0.10.3)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
@ -133,7 +125,7 @@ GEM
formatador (0.2.4)
fssm (0.2.10)
gritter (1.1.0)
guard (2.6.0)
guard (2.6.1)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
@ -193,12 +185,11 @@ GEM
mime-types (1.25.1)
minitest (5.3.3)
modernizr-rails (2.7.1)
multi_json (1.9.3)
multi_json (1.10.0)
mysql2 (0.3.15)
nio4r (1.0.0)
openlayers-rails (0.0.4)
railties (>= 3.1)
orm_adapter (0.5.0)
polyglot (0.3.4)
pry (0.9.12.6)
coderay (~> 1.0)
@ -209,22 +200,22 @@ GEM
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
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)
rails (4.1.1)
actionmailer (= 4.1.1)
actionpack (= 4.1.1)
actionview (= 4.1.1)
activemodel (= 4.1.1)
activerecord (= 4.1.1)
activesupport (= 4.1.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.0)
railties (= 4.1.1)
sprockets-rails (~> 2.0)
rails-i18n (4.0.2)
i18n (~> 0.6)
rails (>= 4.0)
railties (4.1.0)
actionpack (= 4.1.0)
activesupport (= 4.1.0)
railties (4.1.1)
actionpack (= 4.1.1)
activesupport (= 4.1.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.1)
@ -270,8 +261,6 @@ GEM
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
warden (1.2.3)
rack (>= 1.0)
webrick (1.3.1)
PLATFORMS

3
config/initializers/mime_types.rb

@ -2,6 +2,3 @@
# Add new mime types for use in respond_to blocks:
# Mime::Type.register "text/richtext", :rtf
# Mime::Type.register_alias "text/html", :iphone
Mime::Type.register_alias "text/xml", :rss

Loading…
Cancel
Save