Merge branch 'Task/9_create_city_list_page_ID2/industry_list_page_ID3' into…

Merge branch 'Task/9_create_city_list_page_ID2/industry_list_page_ID3' into 'Task/8_create_top_page_ID1'

# Conflicts:
#   Gemfile.lock
#   db/schema.rb

Gemfile.lock

@@ -107,7 +107,6 @@ GEM
     mini_mime (1.1.0)
     minitest (5.14.4)
     msgpack (1.4.2)
-    multi_xml (0.6.0)
     mysql2 (0.5.3)
     nio4r (2.5.7)
     nokogiri (1.11.7-x86_64-linux)
@@ -253,7 +252,6 @@ DEPENDENCIES
   jbuilder (~> 2.7)
   listen (~> 3.3)
   mysql2 (~> 0.5)
-  nokogiri (~> 1.11, >= 1.11.7)
   pry-nav (~> 0.3.0)
   pry-rails (~> 0.3.9)
   puma (~> 5.0)

app/assets/stylesheets/cities.scss

+// Place all the styles related to the Cities controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: https://sass-lang.com/

app/assets/stylesheets/industries.scss

+// Place all the styles related to the Industries controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: https://sass-lang.com/

app/controllers/cities_controller.rb

+class CitiesController < ApplicationController
+end

app/controllers/industries_controller.rb

+class IndustriesController < ApplicationController
+end

app/helpers/cities_helper.rb

+module CitiesHelper
+end

app/helpers/industries_helper.rb

+module IndustriesHelper
+end

db/migrate/20210720055548_create_industries_jobs.rb

+class CreateIndustriesJobs < ActiveRecord::Migration[6.1]
+  def change
+    create_table :industries_jobs do |t|
+      t.references :job, null: false, foreign_key: true
+      t.references :industry, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20210720055614_create_cities_jobs.rb

+class CreateCitiesJobs < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cities_jobs do |t|
+      t.references :job, null: false, foreign_key: true
+      t.references :city, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_07_15_053121) do
+ActiveRecord::Schema.define(version: 2021_07_20_055614) do
 
   create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", null: false