Skip to content

Commit

Permalink
Merge branch 'master' into infringements-mailbox
Browse files Browse the repository at this point in the history
  • Loading branch information
taitus committed Dec 13, 2017
2 parents 3eefe28 + e28dad1 commit 3a47e05
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 0 deletions.
11 changes: 11 additions & 0 deletions app/controllers/static_pages_controller.rb
@@ -0,0 +1,11 @@
class StaticPagesController < ApplicationController
def rules; end

def about_lobbies; end

def code_of_conduct; end

def data_protection; end

def regulatory_and_documentation; end
end
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
8 changes: 8 additions & 0 deletions config/routes.rb
Expand Up @@ -11,6 +11,14 @@
get '/faq', to: 'questions#index', as: 'faq'

resources :infringement_emails, only: [:new, :create]

scope module: 'static_pages' do
get '/rules', to: :rules
get '/about_lobbies', to: :about_lobbies
get '/code_of_conduct', to: :code_of_conduct
get '/data_protection', to: :data_protection
get '/regulatory_and_documentation', to: :regulatory_and_documentation
end

# Admin
get "/admin", to: 'events#index', as: 'admin'
Expand Down

0 comments on commit 3a47e05

Please sign in to comment.