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

Merge branch 'master' into add_map_to_heading_page

Browse Source
This commit is contained in:
Raimond Garcia
2018-11-27 11:07:16 +01:00
committed by GitHub
parent 06f07b1139 1b7a2adf56
commit ed9e501ae7
108 changed files with 6220 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/admin/legislation/processes_controller.rb
View File

@@ -50,6 +50,8 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll
:end_date,
:debate_start_date,
:debate_end_date,
:draft_start_date,
:draft_end_date,
:draft_publication_date,
:allegations_start_date,
:allegations_end_date,
@@ -57,6 +59,7 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll
:proposals_phase_end_date,
:result_publication_date,
:debate_phase_enabled,
:draft_phase_enabled,
:allegations_phase_enabled,
:proposals_phase_enabled,
:draft_publication_enabled,

6
app/controllers/admin/poll/officers_controller.rb
View File

@@ -30,10 +30,4 @@ class Admin::Poll::OfficersController < Admin::Poll::BaseController
redirect_to admin_officers_path
end
def show
end
def edit
end
end