Merge branch 'Task/13_ID15_ID14_ID16' into 'master'
# Conflicts: # Gemfile.lock # app/assets/stylesheets/custom.scss # app/controllers/application_controller.rb # app/controllers/applies_controller.rb # app/javascript/packs/application.js # app/views/layouts/_header.html.slim
Showing
| ... | @@ -64,3 +64,5 @@ gem 'kaminari', :git => 'https://github.com/kaminari/kaminari' | ... | @@ -64,3 +64,5 @@ gem 'kaminari', :git => 'https://github.com/kaminari/kaminari' |
| gem 'nokogiri', '~> 1.11', '>= 1.11.7' | gem 'nokogiri', '~> 1.11', '>= 1.11.7' | ||
| gem 'httparty', '~> 0.18.1' | gem 'httparty', '~> 0.18.1' | ||
| gem 'active_storage_validations', '~> 0.9.5' | gem 'active_storage_validations', '~> 0.9.5' | ||
| gem 'devise', '~> 4.8' | |||
| gem 'jquery-rails', '~> 4.4' | |||
| \ No newline at end of file |
app/assets/stylesheets/users.scss
0 → 100644
app/controllers/users_controller.rb
0 → 100644
app/helpers/users_helper.rb
0 → 100644
app/views/users/confirmations/new.html.erb
0 → 100644
app/views/users/passwords/edit.html.slim
0 → 100644
app/views/users/passwords/new.html.slim
0 → 100644
app/views/users/registrations/edit.html.slim
0 → 100644
app/views/users/registrations/new.html.slim
0 → 100644
app/views/users/sessions/new.html.slim
0 → 100644
app/views/users/shared/_links.html.slim
0 → 100644
app/views/users/show.html.slim
0 → 100644
app/views/users/unlocks/new.html.erb
0 → 100644
config/initializers/devise.rb
0 → 100644
config/locales/devise.en.yml
0 → 100644
test/controllers/users_controller_test.rb
0 → 100644
Please
register
or
sign in
to comment