Merge branch 'master' into 'Task/10_create_job_list_page_ID4'

# Conflicts:
#   Gemfile
#   Gemfile.lock
#   app/models/city.rb
#   db/schema.rb
#   lib/tasks/web_crawler.rake

Gemfile

@@ -31,8 +31,9 @@ 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]
-  gem 'pry-rails', '~> 0.3.9'
-  # gem 'pry-nav', '~> 0.3.0'
+  gem 'pry', '~> 0.14.1'
+  # gem 'pry-nav'
+  gem 'pry-rails'
 end
 end
 
 
 group :development do
 group :development do

Gemfile.lock

@@ -111,7 +111,7 @@ GEM
       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)
     jbuilder (2.11.2)
     jbuilder (2.11.2)
       activesupport (>= 5.0.0)
       activesupport (>= 5.0.0)
-    listen (3.5.1)
+    listen (3.6.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.10.0)
     loofah (2.10.0)
@@ -120,7 +120,7 @@ GEM
     mail (2.7.1)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
       mini_mime (>= 0.1.1)
     marcel (1.0.1)
     marcel (1.0.1)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mime-types (3.3.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0704)
     mime-types-data (3.2021.0704)
@@ -135,9 +135,9 @@ GEM
     parallel (1.20.1)
     parallel (1.20.1)
     parser (3.0.2.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
       ast (~> 2.4.1)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     pry-rails (0.3.9)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
     public_suffix (4.0.6)
@@ -178,7 +178,7 @@ GEM
       rake (>= 0.13)
       rake (>= 0.13)
       thor (~> 1.0)
       thor (~> 1.0)
     rainbow (3.0.0)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
       ffi (~> 1.0)
@@ -193,7 +193,7 @@ GEM
       rubocop-ast (>= 1.7.0, < 2.0)
       rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
+    rubocop-ast (1.8.0)
       parser (>= 3.0.1.1)
       parser (>= 3.0.1.1)
     rubocop-rails (2.11.3)
     rubocop-rails (2.11.3)
       activesupport (>= 4.2.0)
       activesupport (>= 4.2.0)
@@ -218,7 +218,7 @@ GEM
     slim (4.1.0)
     slim (4.1.0)
       temple (>= 0.7.6, < 0.9)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 2.0.6, < 2.1)
       tilt (>= 2.0.6, < 2.1)
-    slim-rails (3.2.0)
+    slim-rails (3.3.0)
       actionpack (>= 3.1)
       actionpack (>= 3.1)
       railties (>= 3.1)
       railties (>= 3.1)
       slim (>= 3.0, < 5.0)
       slim (>= 3.0, < 5.0)
@@ -275,7 +275,8 @@ DEPENDENCIES
   listen (~> 3.3)
   listen (~> 3.3)
   mysql2 (~> 0.5)
   mysql2 (~> 0.5)
   nokogiri (~> 1.11, >= 1.11.7)
   nokogiri (~> 1.11, >= 1.11.7)
-  pry-rails (~> 0.3.9)
+  pry (~> 0.14.1)
+  pry-rails
   puma (~> 5.0)
   puma (~> 5.0)
   rack-mini-profiler (~> 2.0)
   rack-mini-profiler (~> 2.0)
   rails (~> 6.1.3, >= 6.1.3.2)
   rails (~> 6.1.3, >= 6.1.3.2)

db/migrate/20210706092230_create_jobs.rb

 class CreateJobs < ActiveRecord::Migration[6.1]
 class CreateJobs < ActiveRecord::Migration[6.1]
   def change
   def change
     create_table :jobs do |t|
     create_table :jobs do |t|
-      t.string :title
+      t.string :title, null: false
       t.string :job_type
       t.string :job_type
       t.string :salary
       t.string :salary
       t.string :experience
       t.string :experience