From e22953c41b7ff25106e1ce2239bc3155b6e94ee3 Mon Sep 17 00:00:00 2001 From: Rien Maertens Date: Wed, 8 Aug 2018 00:30:01 +0200 Subject: [PATCH] Revert to unbroken state --- .ruby-version | 2 +- .travis.yml | 2 +- Capfile | 2 - Gemfile | 6 +- Gemfile.lock | 351 +++++++++++++++--------------- config/deploy.rb | 4 +- config/deploy/production.rb | 2 +- config/environments/production.rb | 6 +- 8 files changed, 192 insertions(+), 183 deletions(-) diff --git a/.ruby-version b/.ruby-version index 437459c..d64a644 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.0 +2.3.0-dev diff --git a/.travis.yml b/.travis.yml index d488f5c..626de45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: false language: ruby rvm: - - 2.5.0 + - 2.2.0 before_script: - "RAILS_ENV=test bundle exec rake db:create" diff --git a/Capfile b/Capfile index 7c35a22..8de4b12 100644 --- a/Capfile +++ b/Capfile @@ -3,8 +3,6 @@ require 'capistrano/setup' # Includes default deployment tasks require 'capistrano/deploy' -require "capistrano/scm/git" -install_plugin Capistrano::SCM::Git require 'capistrano/rails' require 'capistrano/rbenv' diff --git a/Gemfile b/Gemfile index 49e362b..b4fecfd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 4.2.8' +gem 'rails', '4.2.4' # Assets gem 'sass-rails', '~> 4.0.3' @@ -23,7 +23,7 @@ group :doc do end group :production do - gem 'mysql2', '< 0.5', '>= 0.3.13' # Database + gem 'mysql2', '~> 0.3.18' # Database end group :test do @@ -77,7 +77,7 @@ gem 'identicon' # Run stuff in the background gem 'daemons' -gem 'delayed_job', '4.1.4' +gem 'delayed_job', '~> 4.0' gem 'delayed_job_active_record' gem 'httparty' diff --git a/Gemfile.lock b/Gemfile.lock index 43f2229..f52bd57 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,121 +1,130 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) + actionmailer (4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.10) - actionview (= 4.2.10) - activesupport (= 4.2.10) + actionpack (4.2.4) + actionview (= 4.2.4) + activesupport (= 4.2.4) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.10) - activesupport (= 4.2.10) + actionview (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.10) - activesupport (= 4.2.10) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.4) + activesupport (= 4.2.4) globalid (>= 0.3.0) - activemodel (4.2.10) - activesupport (= 4.2.10) + activemodel (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) - activerecord (4.2.10) - activemodel (= 4.2.10) - activesupport (= 4.2.10) + activerecord (4.2.4) + activemodel (= 4.2.4) + activesupport (= 4.2.4) arel (~> 6.0) - activesupport (4.2.10) + activesupport (4.2.4) i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - airbrake (4.3.8) + addressable (2.4.0) + airbrake (4.3.5) builder multi_json - airbrussh (1.3.0) - sshkit (>= 1.6.1, != 1.7.0) - annotate (2.7.4) + annotate (2.7.0) activerecord (>= 3.2, < 6.0) - rake (>= 10.4, < 13.0) - arel (6.0.4) - bcrypt (3.1.12) + rake (~> 10.4) + arel (6.0.3) + bcrypt (3.1.10) bootstrap-sass (3.2.0.0) sass (~> 3.2) - bootstrap-switch-rails (3.3.4) + bootstrap-switch-rails (3.3.3) bootstrap-will_paginate (0.0.10) will_paginate - builder (3.2.3) - cancancan (2.2.0) - capistrano (3.11.0) - airbrussh (>= 1.0.0) + builder (3.2.2) + cancancan (1.13.1) + capistrano (3.4.0) i18n rake (>= 10.0.0) - sshkit (>= 1.9.0) - capistrano-bundler (1.3.0) + sshkit (~> 1.3) + capistrano-bundler (1.1.4) capistrano (~> 3.1) sshkit (~> 1.2) capistrano-passenger (0.2.0) capistrano (~> 3.0) - capistrano-rails (1.4.0) + capistrano-rails (1.1.6) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano-rbenv (2.1.3) + capistrano-rbenv (2.0.4) capistrano (~> 3.1) sshkit (~> 1.3) capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - chunky_png (1.3.10) - climate_control (0.2.0) - codeclimate-test-reporter (1.0.8) - simplecov (<= 0.13) - concurrent-ruby (1.0.5) - coveralls (0.8.19) - json (>= 1.8, < 3) - simplecov (~> 0.12.0) + chunky_png (1.3.5) + climate_control (0.0.3) + activesupport (>= 3.0) + cocaine (0.5.8) + climate_control (>= 0.0.3, < 1.0) + codeclimate-test-reporter (0.4.8) + simplecov (>= 0.7.1, < 1.0.0) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + coveralls (0.8.10) + json (~> 1.8) + rest-client (>= 1.6.8, < 2) + simplecov (~> 0.11.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) - tins (~> 1.6) + tins (~> 1.6.0) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) - daemons (1.2.6) - delayed_job (4.1.4) - activesupport (>= 3.0, < 5.2) - delayed_job_active_record (4.1.3) - activerecord (>= 3.0, < 5.3) + daemons (1.2.3) + delayed_job (4.1.1) + activesupport (>= 3.0, < 5.0) + delayed_job_active_record (4.1.0) + activerecord (>= 3.0, < 5) delayed_job (>= 3.0, < 5) - devise (4.4.3) + devise (3.5.6) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 3.2.6, < 5) responders + thread_safe (~> 0.1) warden (~> 1.2.3) - diff-lcs (1.3) + diff-lcs (1.2.5) docile (1.1.5) + domain_name (0.5.20160128) + unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - execjs (2.7.0) - factory_girl (4.9.0) + execjs (2.6.0) + factory_girl (4.5.0) activesupport (>= 3.0.0) - factory_girl_rails (4.9.0) - factory_girl (~> 4.9.0) + factory_girl_rails (4.6.0) + factory_girl (~> 4.5.0) railties (>= 3.0.0) faker (1.4.2) i18n (~> 0.5) - faraday (0.12.2) + faraday (0.9.2) multipart-post (>= 1.2, < 3) friendly_id (5.1.0) activerecord (>= 4.0.0) - globalid (0.4.1) - activesupport (>= 4.2.0) + globalid (0.3.6) + activesupport (>= 4.1.0) haml (4.0.7) tilt haml-rails (0.9.0) @@ -124,118 +133,120 @@ GEM haml (>= 4.0.6, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - hashdiff (0.3.7) - hashie (3.5.7) + hashdiff (0.2.3) + hashie (3.4.3) hike (1.2.3) - html2haml (2.2.0) + html2haml (2.0.0) erubis (~> 2.7.0) - haml (>= 4.0, < 6) - nokogiri (>= 1.6.0) + haml (~> 4.0.0) + nokogiri (~> 1.6.0) ruby_parser (~> 3.5) - httparty (0.16.2) + http-cookie (1.0.2) + domain_name (~> 0.5) + httparty (0.13.7) + json (~> 1.8) multi_xml (>= 0.5.2) - i18n (0.9.5) - concurrent-ruby (~> 1.0) + i18n (0.7.0) identicon (0.0.5) chunky_png - jquery-rails (4.3.3) - rails-dom-testing (>= 1, < 3) + jquery-rails (4.1.0) + rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.6) - jwt (1.5.6) - loofah (2.2.2) - crass (~> 1.0.2) + json (1.8.3) + jwt (1.5.1) + loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.7.0) - mini_mime (>= 0.1.1) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mimemagic (0.3.2) - mini_mime (1.0.0) - mini_portile2 (2.3.0) - minitest (5.11.3) - multi_json (1.13.1) - multi_xml (0.6.0) + mail (2.6.3) + mime-types (>= 1.16, < 3) + mime-types (2.99) + mimemagic (0.3.0) + mini_portile2 (2.0.0) + minitest (5.8.4) + multi_json (1.11.2) + multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.4.10) + mysql2 (0.3.20) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (5.0.2) - nokogiri (1.8.4) - mini_portile2 (~> 2.3.0) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + net-ssh (3.0.2) + netrc (0.11.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + oauth2 (1.1.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0, < 1.5.2) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.8.1) - hashie (>= 3.4.6, < 3.6.0) - rack (>= 1.6.2, < 3) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) omniauth-oauth2 (1.3.1) oauth2 (~> 1.0) omniauth (~> 1.2) orm_adapter (0.5.0) - paperclip (6.0.0) - activemodel (>= 4.2.0) - activesupport (>= 4.2.0) + paperclip (4.3.4) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + cocaine (~> 0.5.5) mime-types - mimemagic (~> 0.3.0) - terrapin (~> 0.6.0) - public_suffix (3.0.2) - rack (1.6.10) + mimemagic (= 0.3.0) + rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.10) - actionmailer (= 4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) - activemodel (= 4.2.10) - activerecord (= 4.2.10) - activesupport (= 4.2.10) + rails (4.2.4) + actionmailer (= 4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) + activemodel (= 4.2.4) + activerecord (= 4.2.4) + activesupport (= 4.2.4) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.10) + railties (= 4.2.4) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (4.2.10) - actionpack (= 4.2.10) - activesupport (= 4.2.10) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.4) + actionpack (= 4.2.4) + activesupport (= 4.2.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.1) - rdoc (4.3.0) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rake (10.5.0) + rdoc (4.2.1) + json (~> 1.4) + responders (2.1.1) + railties (>= 4.2.0, < 5.1) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + rspec-core (3.4.2) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.4.0) + rspec-mocks (3.4.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-rails (3.7.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.1) - ruby_parser (3.11.0) - sexp_processor (~> 4.9) + rspec-support (~> 3.4.0) + rspec-rails (3.4.2) + actionpack (>= 3.0, < 4.3) + activesupport (>= 3.0, < 4.3) + railties (>= 3.0, < 4.3) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) + ruby_parser (3.7.3) + sexp_processor (~> 4.1) safe_yaml (1.0.4) sass (3.2.19) sass-rails (4.0.5) @@ -243,18 +254,17 @@ GEM sass (~> 3.2.2) sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) - sdoc (0.4.2) + sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - sexp_processor (4.11.0) - simplecov (0.12.0) + sexp_processor (4.6.1) + simplecov (0.11.2) docile (~> 1.1.0) - json (>= 1.8, < 3) + json (~> 1.8) simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - spring (2.0.2) - activesupport (>= 4.2) - sprockets (2.12.5) + simplecov-html (0.10.0) + spring (1.6.2) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -263,28 +273,29 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.13) - sshkit (1.17.0) + sqlite3 (1.3.11) + sshkit (1.8.1) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - term-ansicolor (1.6.0) + term-ansicolor (1.3.2) tins (~> 1.0) - terrapin (0.6.0) - climate_control (>= 0.0.3, < 1.0) - thor (0.19.4) - thread_safe (0.3.6) + thor (0.19.1) + thread_safe (0.3.5) tilt (1.4.1) - tins (1.16.3) - turbolinks (5.1.1) - turbolinks-source (~> 5.1) - turbolinks-source (5.1.0) - tzinfo (1.2.5) + tins (1.6.0) + turbolinks (2.5.3) + coffee-rails + tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (4.1.16) - execjs (>= 0.3.0, < 3) - warden (1.2.7) + uglifier (2.7.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.2) + warden (1.2.6) rack (>= 1.0) - webmock (3.4.2) + webmock (1.22.6) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -308,7 +319,7 @@ DEPENDENCIES codeclimate-test-reporter coveralls daemons - delayed_job (= 4.1.4) + delayed_job (~> 4.0) delayed_job_active_record devise factory_girl_rails @@ -318,10 +329,10 @@ DEPENDENCIES httparty identicon jquery-rails - mysql2 (>= 0.3.13, < 0.5) + mysql2 (~> 0.3.18) omniauth-oauth2 (= 1.3.1) paperclip - rails (~> 4.2.8) + rails (= 4.2.4) rspec-rails sass-rails (~> 4.0.3) sdoc (~> 0.4.0) @@ -333,4 +344,4 @@ DEPENDENCIES will_paginate (= 3.0.7) BUNDLED WITH - 1.16.3 + 1.11.2 diff --git a/config/deploy.rb b/config/deploy.rb index a3af85b..3f1968a 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -2,9 +2,9 @@ # lock '3.1.0' set :application, 'Tap' -set :repo_url, 'https://github.com/ZeusWPI/Tap.git' +set :repo_url, 'git@github.com:ZeusWPI/Tap.git' -set :branch, 'herbert' +set :branch, 'master' set :deploy_to, '/home/tap/production' # Default branch is :master diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 3fde857..18ef671 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1,4 +1,4 @@ -server 'tap.zeus.gent', user: 'tap', roles: %w{web app db}, ssh_options: { +server 'zeus.ugent.be', user: 'tap', roles: %w{web app db}, ssh_options: { forward_agent: true, auth_methods: ['publickey'], port: 2222 diff --git a/config/environments/production.rb b/config/environments/production.rb index 8589b7b..a59f0bd 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -79,13 +79,13 @@ Rails.application.configure do Paperclip.options[:command_path] = "/usr/local/bin/" # Help the asset pipeline for staging - config.x.host = 'tap.zeus.gent' - config.relative_url_root = "/" + config.x.host = 'zeus.ugent.be' + config.relative_url_root = "/tap" config.action_mailer.default_url_options = { host: config.x.host, script_name: config.relative_url_root, } - config.api_url = "https://tab.zeus.gent" + config.api_url = "https://zeus.ugent.be/tab" end