Download as
Browse Code »

Commit 5f38014ae2c5f075b7edc0d52b92e68afa89ff0f

Authored by Victor Costa
Committed by Rodrigo Souto
1 parent b223ac66
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails3: fix grape initialization

Showing 3 changed files with 8 additions and 6 deletions   Show diff stats
Gemfile
  Diff comments   View file @5f38014
... ... @@ -19,6 +19,10 @@ gem 'gettext', '~> 2.2.1', :require => false
19 19 gem 'locale', '~> 2.0.5'
20 20 gem 'whenever', :require => false
21 21 gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
  22 +gem 'grape', '0.2.1'
  23 +
  24 +# FIXME list here all actual dependencies (i.e. the ones in debian/control),
  25 +# with their GEM names (not the Debian package names)
22 26  
23 27 # asset pipeline
24 28 gem 'uglifier', '>= 1.0.3'
... ...
app/models/comment.rb
  Diff comments   View file @5f38014
... ... @@ -21,12 +21,12 @@ class Comment < ActiveRecord::Base
21 21 scope :without_reply, :conditions => ['reply_of_id IS NULL']
22 22  
23 23 #FIXME make this test
24   - named_scope :newer_than, lambda { |reference_id|
  24 + scope :newer_than, lambda { |reference_id|
25 25 {:conditions => ["comments.id > #{reference_id}"]}
26 26 }
27 27  
28 28 #FIXME make this test
29   - named_scope :older_than, lambda { |reference_id|
  29 + scope :older_than, lambda { |reference_id|
30 30 {:conditions => ["comments.id < #{reference_id}"]}
31 31 }
32 32  
... ...
config.ru
  Diff comments   View file @5f38014
... ... @@ -10,11 +10,9 @@ require &quot;config/environment&quot;
10 10 #run ActionController::Dispatcher.new
11 11  
12 12 rails_app = Rack::Builder.new do
13   - use Rails::Rack::LogTailer
14   - use Rails::Rack::Static
15   - run ActionController::Dispatcher.new
  13 + run Noosfero::Application
16 14 end
17   -
  15 +
18 16 run Rack::Cascade.new([
19 17 API::API,
20 18 rails_app
... ...