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

Merge branch 'suggest_before_creating'

Browse Source 
Conflicts:
	app/assets/javascripts/application.js
	app/controllers/debates_controller.rb
	app/controllers/proposals_controller.rb
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
	spec/features/debates_spec.rb
	spec/features/proposals_spec.rb
This commit is contained in:
MaiteHdezRivas
2016-01-27 13:11:23 +01:00
parent 4b1430c9d6 7406904c51
commit 5dd4633d6a
16 changed files with 198 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/debates_controller.rb
View File

@@ -3,7 +3,7 @@ class DebatesController < ApplicationController
include CommentableActions
include FlagActions
before_action :parse_search_terms, only: :index
before_action :parse_search_terms, only: [:index, :suggest]
before_action :parse_advanced_search_terms, only: :index
before_action :parse_tag_filter, only: :index
before_action :set_search_order, only: :index