diff --git a/Gemfile b/Gemfile index 0ef3d51..d892ff3 100644 --- a/Gemfile +++ b/Gemfile @@ -8,10 +8,10 @@ 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' +gem 'puma', '~> 3.12' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' diff --git a/Gemfile.lock b/Gemfile.lock index 0832e8a..6a05c5f 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.4.10.2) execjs bindex (0.5.0) bootstrap (4.1.3) autoprefixer-rails (>= 6.0.3) popper_js (>= 1.12.9, < 2) sass (>= 3.5.2) - builder (3.2.3) - byebug (10.0.2) + builder (3.2.4) + byebug (11.0.0) capybara (2.18.0) addressable mini_mime (>= 0.1.3) @@ -73,22 +73,22 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.4) - crass (1.0.4) - devise (4.5.0) + concurrent-ruby (1.1.6) + crass (1.0.6) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - erubi (1.8.0) + erubi (1.9.0) execjs (2.7.0) ffi (1.10.0) 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.8.2) concurrent-ruby (~> 1.0) jbuilder (2.8.0) activesupport (>= 4.2.0) @@ -106,7 +106,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - loofah (2.2.3) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -114,10 +114,10 @@ GEM method_source (0.9.2) mini_mime (1.0.1) mini_portile2 (2.4.0) - minitest (5.11.3) + minitest (5.14.0) multi_json (1.13.1) nio4r (2.3.1) - nokogiri (1.10.1) + nokogiri (1.10.8) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) pg (1.1.4) @@ -125,40 +125,40 @@ GEM postgresql (1.0.0) pg public_suffix (3.0.3) - puma (3.12.0) - rack (2.0.6) + puma (3.12.3) + rack (2.2.2) 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) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + 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) + rake (13.0.1) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) + responders (3.0.0) + actionpack (>= 5.0) + railties (>= 5.0) rubyzip (1.2.2) sass (3.7.3) sass-listen (~> 4.0.0) @@ -188,15 +188,15 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - temple (0.8.0) - thor (0.20.3) + sqlite3 (1.4.0) + temple (0.8.1) + thor (1.0.1) thread_safe (0.3.6) tilt (2.0.9) turbolinks (5.2.0) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) tzinfo-data (1.2018.9) tzinfo (>= 1.0.0) @@ -233,8 +233,8 @@ DEPENDENCIES jbuilder (~> 2.5) jquery-rails postgresql - puma (~> 3.7) - rails (~> 5.1.3) + puma (~> 3.12) + 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 diff --git a/main.rb b/main.rb new file mode 100644 index 0000000..07072e5 --- /dev/null +++ b/main.rb @@ -0,0 +1 @@ +puts "Ruby language project" diff --git a/package.json b/package.json deleted file mode 100644 index 519b3bb..0000000 --- a/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "ShortUrlApp", - "private": true, - "dependencies": {} -}