consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into comment-show

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-01-08 13:41:25 +01:00
parent 5ef9f4de87 017bfe9146
commit 9db19a3049
19 changed files with 119 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/debates_controller.rb
View File

@@ -7,7 +7,7 @@ class DebatesController < ApplicationController
before_action :set_search_order, only: :index
before_action :authenticate_user!, except: [:index, :show]
has_orders %w{hot_score confidence_score created_at most_commented random relevance}, only: :index
has_orders %w{hot_score confidence_score created_at relevance}, only: :index
has_orders %w{most_voted newest oldest}, only: :show
load_and_authorize_resource

2
app/controllers/proposals_controller.rb
View File

@@ -7,7 +7,7 @@ class ProposalsController < ApplicationController
before_action :set_search_order, only: :index
before_action :authenticate_user!, except: [:index, :show]
has_orders %w{hot_score confidence_score created_at most_commented random relevance}, only: :index
has_orders %w{hot_score confidence_score created_at relevance}, only: :index
has_orders %w{most_voted newest oldest}, only: :show
load_and_authorize_resource