Merge branch 'master' into 'crawler'
# Conflicts: # app/assets/javascripts/custom.js # app/models/city.rb
Showing
app/controllers/home_controller.rb
0 → 100644
app/controllers/job_controller.rb
0 → 100644
app/helpers/home_helper.rb
0 → 100644
app/helpers/job_helper.rb
0 → 100644
app/views/home/_banner_and_search.html.erb
0 → 100644
app/views/home/_box_five_job.html.erb
0 → 100644
app/views/home/_box_nine_city.html.erb
0 → 100644
app/views/home/_box_nine_industries.html.erb
0 → 100644
app/views/home/index.html.erb
0 → 100644
app/views/job/_modal_login.html.erb
0 → 100644
app/views/layouts/_footer.html.erb
0 → 100644
app/views/layouts/_header.html.erb
0 → 100644
app/views/layouts/_padding.html.erb
0 → 100644
app/views/shared/_scroll_top.html.erb
0 → 100644
app/views/shared/_shim.html.erb
0 → 100644
test/controllers/home_controller_test.rb
0 → 100644
test/controllers/job_controller_test.rb
0 → 100644
Please
register
or
sign in
to comment