diff --git a/Gemfile b/Gemfile index 0ef3d51..329b909 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ git_source(:github) do |repo_name| end # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.1.3' +gem 'rails', '~> 5.1.6.2' # Use sqlite3 as the database for Active Record # Use Puma as the app server gem 'puma', '~> 3.7' @@ -43,7 +43,7 @@ gem 'devise' #gem 'faraday' #gem 'bootstrap-sass', '~> 3.3.3' -gem 'bootstrap', '~> 4.1.2' #'~> 4.0.0.beta2.1' +gem 'bootstrap', '~> 4.3.1' #'~> 4.0.0.beta2.1' gem 'jquery-rails' gem 'http' diff --git a/Gemfile.lock b/Gemfile.lock index 0832e8a..af2eea0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,45 +1,45 @@ GIT remote: https://github.com/codahale/bcrypt-ruby.git - revision: 84c8d7b6b5492920631078594d0788f3ca205ecb + revision: 7644e3684d96fb49f5aa20cb5f547cb1b56b3f38 specs: bcrypt (3.1.12) GEM remote: https://rubygems.org/ specs: - actioncable (5.1.6.1) - actionpack (= 5.1.6.1) + actioncable (5.1.6.2) + actionpack (= 5.1.6.2) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.6.1) - actionpack (= 5.1.6.1) - actionview (= 5.1.6.1) - activejob (= 5.1.6.1) + actionmailer (5.1.6.2) + actionpack (= 5.1.6.2) + actionview (= 5.1.6.2) + activejob (= 5.1.6.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.6.1) - actionview (= 5.1.6.1) - activesupport (= 5.1.6.1) + actionpack (5.1.6.2) + actionview (= 5.1.6.2) + activesupport (= 5.1.6.2) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.6.1) - activesupport (= 5.1.6.1) + actionview (5.1.6.2) + activesupport (= 5.1.6.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.6.1) - activesupport (= 5.1.6.1) + activejob (5.1.6.2) + activesupport (= 5.1.6.2) globalid (>= 0.3.6) - activemodel (5.1.6.1) - activesupport (= 5.1.6.1) - activerecord (5.1.6.1) - activemodel (= 5.1.6.1) - activesupport (= 5.1.6.1) + activemodel (5.1.6.2) + activesupport (= 5.1.6.2) + activerecord (5.1.6.2) + activemodel (= 5.1.6.2) + activesupport (= 5.1.6.2) arel (~> 8.0) - activesupport (5.1.6.1) + activesupport (5.1.6.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -47,15 +47,15 @@ GEM addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) arel (8.0.0) - autoprefixer-rails (9.4.7) + autoprefixer-rails (9.7.3) execjs bindex (0.5.0) - bootstrap (4.1.3) - autoprefixer-rails (>= 6.0.3) - popper_js (>= 1.12.9, < 2) - sass (>= 3.5.2) + bootstrap (4.3.1) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 1.14.3, < 2) + sassc-rails (>= 2.0.0) builder (3.2.3) - byebug (10.0.2) + byebug (11.0.0) capybara (2.18.0) addressable mini_mime (>= 0.1.3) @@ -73,9 +73,9 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) crass (1.0.4) - devise (4.5.0) + devise (4.6.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -85,10 +85,10 @@ GEM unf (>= 0.0.5, < 1.0.0) erubi (1.8.0) execjs (2.7.0) - ffi (1.10.0) + ffi (1.11.3) globalid (0.4.2) activesupport (>= 4.2.0) - http (4.0.3) + http (4.1.1) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 2.0) @@ -97,7 +97,7 @@ GEM domain_name (~> 0.5) http-form_data (2.1.1) http_parser.rb (0.6.0) - i18n (1.5.3) + i18n (1.6.0) concurrent-ruby (~> 1.0) jbuilder (2.8.0) activesupport (>= 4.2.0) @@ -129,38 +129,38 @@ GEM rack (2.0.6) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.1.6.1) - actioncable (= 5.1.6.1) - actionmailer (= 5.1.6.1) - actionpack (= 5.1.6.1) - actionview (= 5.1.6.1) - activejob (= 5.1.6.1) - activemodel (= 5.1.6.1) - activerecord (= 5.1.6.1) - activesupport (= 5.1.6.1) + rails (5.1.6.2) + actioncable (= 5.1.6.2) + actionmailer (= 5.1.6.2) + actionpack (= 5.1.6.2) + actionview (= 5.1.6.2) + activejob (= 5.1.6.2) + activemodel (= 5.1.6.2) + activerecord (= 5.1.6.2) + activesupport (= 5.1.6.2) bundler (>= 1.3.0) - railties (= 5.1.6.1) + railties (= 5.1.6.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - railties (5.1.6.1) - actionpack (= 5.1.6.1) - activesupport (= 5.1.6.1) + railties (5.1.6.2) + actionpack (= 5.1.6.2) + activesupport (= 5.1.6.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.2) rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-inotify (0.10.1) ffi (~> 1.0) responders (2.4.1) actionpack (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.0) rubyzip (1.2.2) - sass (3.7.3) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -171,6 +171,14 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) @@ -188,8 +196,8 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - temple (0.8.0) + sqlite3 (1.4.0) + temple (0.8.1) thor (0.20.3) thread_safe (0.3.6) tilt (2.0.9) @@ -223,7 +231,7 @@ PLATFORMS DEPENDENCIES bcrypt! - bootstrap (~> 4.1.2) + bootstrap (~> 4.3.1) byebug capybara (~> 2.13) certified @@ -234,7 +242,7 @@ DEPENDENCIES jquery-rails postgresql puma (~> 3.7) - rails (~> 5.1.3) + rails (~> 5.1.6.2) sass-rails (~> 5.0) selenium-webdriver slim diff --git a/config/database.yml b/config/database.yml deleted file mode 100644 index 0f14a4f..0000000 --- a/config/database.yml +++ /dev/null @@ -1,31 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -# -default: &default - adapter: sqlite3 - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - timeout: 5000 - -development: - <<: *default - database: db/development.sqlite3 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - <<: *default - database: db/test.sqlite3 - -production: - adapter: postgresql - encoding: utf8 - database: d4kng0r47o6jeh - host: ec2-54-247-99-159.eu-west-1.compute.amazonaws.com - port: 5432 - pool: 5 - username: ytqqhbecogkzzz - password: 79bc150ca77df60141bf0ccbacdb69f90048473bb677da770795f3f1ef51408f