merge master to branch task 12
Showing
| ... | @@ -31,9 +31,15 @@ gem 'bootsnap', '>= 1.4.4', require: false | ... | @@ -31,9 +31,15 @@ gem 'bootsnap', '>= 1.4.4', require: false |
| group :development, :test do | group :development, :test do | ||
| # Call 'byebug' anywhere in the code to stop execution and get a debugger console | # Call 'byebug' anywhere in the code to stop execution and get a debugger console | ||
| gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] | gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] | ||
| <<<<<<< HEAD | |||
| gem 'pry-rails', '~> 0.3.9' | gem 'pry-rails', '~> 0.3.9' | ||
| # gem 'pry-nav', '~> 0.3.0' | # gem 'pry-nav', '~> 0.3.0' | ||
| gem 'pry', '~> 0.14.1' | gem 'pry', '~> 0.14.1' | ||
| ======= | |||
| gem 'pry', '~> 0.14.1' | |||
| # gem 'pry-nav' | |||
| gem 'pry-rails' | |||
| >>>>>>> master | |||
| end | end | ||
| group :development do | group :development do | ||
| ... | ... |
app/assets/images/banner.jpg
0 → 100644
357 KB
app/assets/stylesheets/cities.scss
deleted
100644 → 0
app/assets/stylesheets/jobs.scss
deleted
100644 → 0
app/helpers/cities_helper.rb
deleted
100644 → 0
app/helpers/industries_helper.rb
deleted
100644 → 0
app/helpers/jobs_helper.rb
deleted
100644 → 0
app/views/jobs/_breadcrumb.html.slim
deleted
100644 → 0
app/views/jobs/_jobs.html.slim
deleted
100644 → 0
app/views/top/_latest_jobs.html.slim
deleted
100644 → 0
app/views/top/_search.html.slim
deleted
100644 → 0
app/views/top/_top_cities.html.slim
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment