Skip to content

Commit

Permalink
Merged + whitespaced.
Browse files Browse the repository at this point in the history
  • Loading branch information
parndt committed Mar 8, 2011
1 parent b1fa9fc commit e2524ef
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
refinerycms (0.9.9.5)
refinerycms (0.9.9.6)
bundler (~> 1.0.10)
refinerycms-authentication (~> 0.9.9.5)
refinerycms-base (~> 0.9.9.5)
Expand All @@ -14,7 +14,7 @@ PATH
refinerycms-authentication (0.9.9.5)
devise (~> 1.1)
refinerycms-core (~> 0.9.9.5)
refinerycms-base (0.9.9.5)
refinerycms-base (0.9.9.6)
refinerycms-core (0.9.9.5)
acts_as_indexed (~> 0.7)
friendly_id_globalize3 (~> 3.2.1)
Expand Down
2 changes: 1 addition & 1 deletion core/lib/refinery/crud.rb
Expand Up @@ -168,7 +168,7 @@ def paginate_all_#{plural_name}
elsif #{class_name}.methods.map(&:to_sym).include?(:per_page)
paging_options.update({:per_page => #{class_name}.per_page})
end
@#{plural_name} = @#{plural_name}.paginate(paging_options)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/refinerycms.rb
@@ -1,3 +1,3 @@
require 'refinerycms-base'

require File.expand_path('../refinerycms/all', __FILE__) unless defined?(REFINERYCMS_INSTALLER)
require File.expand_path('../refinerycms/all', __FILE__) unless defined?(REFINERYCMS_INSTALLER)

0 comments on commit e2524ef

Please sign in to comment.