Commit 0ff3b32e by thanhnd

Merge branch 'master' into 'job_list_page'

# Conflicts:
#   config/routes.rb
parents 8b4e9b3b c94c18ed
Pipeline #502 failed with stages
in 0 seconds
...@@ -6,5 +6,4 @@ Rails.application.routes.draw do ...@@ -6,5 +6,4 @@ Rails.application.routes.draw do
root 'top_page#index' root 'top_page#index'
# For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
resources :top_page resources :top_page
resources :jobs, :only => [:show, :index]
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment