gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update awesome_nested_set

Browse source 
The stable release of awesome_nested_set isn't compatible with Rails 4.1;
running in production mode errors out at init.

Issue 253 suggests resolving with 3.0.0 RC
https://github.com/collectiveidea/awesome_nested_set/issues/253

Conflicts:
	Gemfile.lock
This commit is contained in:
James Mason 2014-06-17 10:35:16 -07:00
parent 20f31621ee
commit 0f697f3dbe
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -27,6 +27,7 @@ gem 'cancan'
gem 'transitions', :require => %w( transitions active_record/transitions ) gem 'transitions', :require => %w( transitions active_record/transitions )
# Use acts_as_commentable_with_threading for comments # Use acts_as_commentable_with_threading for comments
gem 'awesome_nested_set', '~> 3.0.0.rc.5'
gem 'acts_as_commentable_with_threading' gem 'acts_as_commentable_with_threading'
# Use haml as templating language # Use haml as templating language

11
Gemfile.lock
View file

@ -36,8 +36,8 @@ GEM
addressable (2.3.6) addressable (2.3.6)
arel (5.0.1.20140414130214) arel (5.0.1.20140414130214)
ast (2.0.0) ast (2.0.0)
awesome_nested_set (2.1.6) awesome_nested_set (3.0.0.rc.5)
activerecord (>= 3.0.0) activerecord (>= 4.0.0, < 5)
axlsx (2.0.1) axlsx (2.0.1)
htmlentities (~> 4.3.1) htmlentities (~> 4.3.1)
nokogiri (>= 1.4.1) nokogiri (>= 1.4.1)
@ -164,7 +164,7 @@ GEM
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (1.25.1)
mini_portile (0.6.0) mini_portile (0.6.0)
minitest (5.3.3) minitest (5.3.4)
multi_json (1.9.2) multi_json (1.9.2)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
@ -327,7 +327,7 @@ GEM
term-ansicolor (1.3.0) term-ansicolor (1.3.0)
tins (~> 1.0) tins (~> 1.0)
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.3) thread_safe (0.3.4)
tilt (1.4.1) tilt (1.4.1)
timers (1.1.0) timers (1.1.0)
tins (1.1.0) tins (1.1.0)
@ -338,7 +338,7 @@ GEM
ttfunk (1.1.1) ttfunk (1.1.1)
turbolinks (2.2.2) turbolinks (2.2.2)
coffee-rails coffee-rails
tzinfo (1.1.0) tzinfo (1.2.1)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.5.0) uglifier (2.5.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
@ -355,6 +355,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
active_model_serializers active_model_serializers
acts_as_commentable_with_threading acts_as_commentable_with_threading
awesome_nested_set (~> 3.0.0.rc.5)
axlsx_rails axlsx_rails
bootstrap-sass bootstrap-sass
cancan cancan