From 790dd898692e58a05fdac7192ea50048dcceee79 Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Mon, 27 Jun 2016 16:10:50 +0200 Subject: [PATCH 1/5] Default build tests ruby 2.3.1 Ruby 2.1.8 is used only on master for now, as this would give confidance in case this commit has to be reverted. --- .gitlab-ci.yml | 80 +++++++++++++++++++++++++------------------------- .ruby-version | 2 +- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8450d43fc0f..d89a0875440 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ -image: "ruby:2.1" +image: "ruby:2.3" cache: - key: "ruby21" + key: "ruby-23" paths: - vendor/apt - vendor/ruby @@ -138,57 +138,57 @@ spinach 7 10: *spinach-knapsack spinach 8 10: *spinach-knapsack spinach 9 10: *spinach-knapsack -# Execute all testing suites against Ruby 2.3 -.ruby-23: &ruby-23 - image: "ruby:2.3" +# Execute all testing suites against Ruby 2.1 +.ruby-21: &ruby-21 + image: "ruby:2.1" <<: *use-db only: - master cache: - key: "ruby-23" + key: "ruby21" paths: - vendor/apt - vendor/ruby -.rspec-knapsack-ruby23: &rspec-knapsack-ruby23 +.rspec-knapsack-ruby21: &rspec-knapsack-ruby21 <<: *rspec-knapsack - <<: *ruby-23 + <<: *ruby-21 -.spinach-knapsack-ruby23: &spinach-knapsack-ruby23 +.spinach-knapsack-ruby23: &spinach-knapsack-ruby21 <<: *spinach-knapsack - <<: *ruby-23 + <<: *ruby-21 -rspec 0 20 ruby23: *rspec-knapsack-ruby23 -rspec 1 20 ruby23: *rspec-knapsack-ruby23 -rspec 2 20 ruby23: *rspec-knapsack-ruby23 -rspec 3 20 ruby23: *rspec-knapsack-ruby23 -rspec 4 20 ruby23: *rspec-knapsack-ruby23 -rspec 5 20 ruby23: *rspec-knapsack-ruby23 -rspec 6 20 ruby23: *rspec-knapsack-ruby23 -rspec 7 20 ruby23: *rspec-knapsack-ruby23 -rspec 8 20 ruby23: *rspec-knapsack-ruby23 -rspec 9 20 ruby23: *rspec-knapsack-ruby23 -rspec 10 20 ruby23: *rspec-knapsack-ruby23 -rspec 11 20 ruby23: *rspec-knapsack-ruby23 -rspec 12 20 ruby23: *rspec-knapsack-ruby23 -rspec 13 20 ruby23: *rspec-knapsack-ruby23 -rspec 14 20 ruby23: *rspec-knapsack-ruby23 -rspec 15 20 ruby23: *rspec-knapsack-ruby23 -rspec 16 20 ruby23: *rspec-knapsack-ruby23 -rspec 17 20 ruby23: *rspec-knapsack-ruby23 -rspec 18 20 ruby23: *rspec-knapsack-ruby23 -rspec 19 20 ruby23: *rspec-knapsack-ruby23 +rspec 0 20 ruby21: *rspec-knapsack-ruby21 +rspec 1 20 ruby21: *rspec-knapsack-ruby21 +rspec 2 20 ruby21: *rspec-knapsack-ruby21 +rspec 3 20 ruby21: *rspec-knapsack-ruby21 +rspec 4 20 ruby21: *rspec-knapsack-ruby21 +rspec 5 20 ruby21: *rspec-knapsack-ruby21 +rspec 6 20 ruby21: *rspec-knapsack-ruby21 +rspec 7 20 ruby21: *rspec-knapsack-ruby21 +rspec 8 20 ruby21: *rspec-knapsack-ruby21 +rspec 9 20 ruby21: *rspec-knapsack-ruby21 +rspec 10 20 ruby21: *rspec-knapsack-ruby21 +rspec 11 20 ruby21: *rspec-knapsack-ruby21 +rspec 12 20 ruby21: *rspec-knapsack-ruby21 +rspec 13 20 ruby21: *rspec-knapsack-ruby21 +rspec 14 20 ruby21: *rspec-knapsack-ruby21 +rspec 15 20 ruby21: *rspec-knapsack-ruby21 +rspec 16 20 ruby21: *rspec-knapsack-ruby21 +rspec 17 20 ruby21: *rspec-knapsack-ruby21 +rspec 18 20 ruby21: *rspec-knapsack-ruby21 +rspec 19 20 ruby21: *rspec-knapsack-ruby21 -spinach 0 10 ruby23: *spinach-knapsack-ruby23 -spinach 1 10 ruby23: *spinach-knapsack-ruby23 -spinach 2 10 ruby23: *spinach-knapsack-ruby23 -spinach 3 10 ruby23: *spinach-knapsack-ruby23 -spinach 4 10 ruby23: *spinach-knapsack-ruby23 -spinach 5 10 ruby23: *spinach-knapsack-ruby23 -spinach 6 10 ruby23: *spinach-knapsack-ruby23 -spinach 7 10 ruby23: *spinach-knapsack-ruby23 -spinach 8 10 ruby23: *spinach-knapsack-ruby23 -spinach 9 10 ruby23: *spinach-knapsack-ruby23 +spinach 0 10 ruby21: *spinach-knapsack-ruby21 +spinach 1 10 ruby21: *spinach-knapsack-ruby21 +spinach 2 10 ruby21: *spinach-knapsack-ruby21 +spinach 3 10 ruby21: *spinach-knapsack-ruby21 +spinach 4 10 ruby21: *spinach-knapsack-ruby21 +spinach 5 10 ruby21: *spinach-knapsack-ruby21 +spinach 6 10 ruby21: *spinach-knapsack-ruby21 +spinach 7 10 ruby21: *spinach-knapsack-ruby21 +spinach 8 10 ruby21: *spinach-knapsack-ruby21 +spinach 9 10 ruby21: *spinach-knapsack-ruby21 # Other generic tests diff --git a/.ruby-version b/.ruby-version index ebf14b46981..2bf1c1ccf36 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.1.8 +2.3.1 From 39103b1437b65b9e516649153d16c31226396989 Mon Sep 17 00:00:00 2001 From: Connor Shea Date: Mon, 27 Jun 2016 09:34:17 -0600 Subject: [PATCH 2/5] Update docs to reference Ruby 2.3.1 --- doc/install/installation.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index c044d0880d3..118d1fc3966 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -108,8 +108,7 @@ Then select 'Internet Site' and press enter to confirm the hostname. ## 2. Ruby -_**Note:** The current supported Ruby version is 2.1.x. Ruby 2.2 and 2.3 are -currently not supported._ +_**Note:** The current supported Ruby version is 2.3.x. The use of Ruby version managers such as [RVM], [rbenv] or [chruby] with GitLab in production, frequently leads to hard to diagnose problems. For example, @@ -124,9 +123,9 @@ Remove the old Ruby 1.8 if present: Download Ruby and compile it: mkdir /tmp/ruby && cd /tmp/ruby - curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.8.tar.gz - echo 'c7e50159357afd87b13dc5eaf4ac486a70011149 ruby-2.1.8.tar.gz' | shasum -c - && tar xzf ruby-2.1.8.tar.gz - cd ruby-2.1.8 + curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.1.tar.gz + echo 'c39b4001f7acb4e334cb60a0f4df72d434bef711 ruby-2.3.1.tar.gz' | shasum -c - && tar xzf ruby-2.3.1.tar.gz + cd ruby-2.3.1 ./configure --disable-install-rdoc make sudo make install @@ -591,13 +590,13 @@ for the changes to take effect. If you'd like to connect to a Redis server on a non-standard port or on a different host, you can configure its connection string via the `config/resque.yml` file. # example - production: + production: url: redis://redis.example.tld:6379 If you want to connect the Redis server via socket, then use the "unix:" URL scheme and the path to the Redis socket file in the `config/resque.yml` file. # example - production: + production: url: unix:/path/to/redis/socket ### Custom SSH Connection From 100df6c3f40d053983e8adf0d7e9e162fceba41a Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Mon, 27 Jun 2016 17:54:19 +0200 Subject: [PATCH 3/5] Update gitlab ci tests to test ruby 2.1 now too --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d89a0875440..2a63ee15af0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,7 +154,7 @@ spinach 9 10: *spinach-knapsack <<: *rspec-knapsack <<: *ruby-21 -.spinach-knapsack-ruby23: &spinach-knapsack-ruby21 +.spinach-knapsack-ruby21: &spinach-knapsack-ruby21 <<: *spinach-knapsack <<: *ruby-21 From 9f9e38fff5fc682f05286fe7e88d8e688fa3e5b3 Mon Sep 17 00:00:00 2001 From: Connor Shea Date: Tue, 28 Jun 2016 09:34:22 -0600 Subject: [PATCH 4/5] Update currently supported Ruby version info. --- CHANGELOG | 2 ++ doc/install/installation.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 5067304f561..efd2d164dbd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -174,6 +174,8 @@ v 8.10.0 - Add an API for downloading latest successful build from a particular branch or tag. !5347 - Avoid data-integrity issue when cleaning up repository archive cache. - Add link to profile to commit avatar. !5163 (winniehell) + - Remove pinTo from Flash and make inline flash messages look nicer !4854 (winniehell) + - Update to Ruby 2.3.1. !4948 - Wrap code blocks on Activies and Todos page. !4783 (winniehell) - Align flash messages with left side of page content. !4959 (winniehell) - Display tooltip for "Copy to Clipboard" button. !5164 (winniehell) diff --git a/doc/install/installation.md b/doc/install/installation.md index 118d1fc3966..eb9606934cd 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -108,7 +108,7 @@ Then select 'Internet Site' and press enter to confirm the hostname. ## 2. Ruby -_**Note:** The current supported Ruby version is 2.3.x. +_**Note:** The current supported Ruby versions are 2.1.x and 2.3.x. 2.3.x is preferred, and support for 2.1.x will be dropped in the future. The use of Ruby version managers such as [RVM], [rbenv] or [chruby] with GitLab in production, frequently leads to hard to diagnose problems. For example, From 3b973d1898eeb660f85d70affdf0e933328f985d Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Thu, 11 Aug 2016 18:54:14 +0200 Subject: [PATCH 5/5] Target 8.11 for CHANGELOG entry Ruby 2.3 --- CHANGELOG | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index efd2d164dbd..8cefaf5d70a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ v 8.11.0 (unreleased) - Fix rename `add_users_into_project` and `projects_ids`. !20512 (herminiotorres) - Fix the title of the toggle dropdown button. !5515 (herminiotorres) - Rename `markdown_preview` routes to `preview_markdown`. (Christopher Bartz) + - Update to Ruby 2.3.1. !4948 - Improve diff performance by eliminating redundant checks for text blobs - Ensure that branch names containing escapable characters (e.g. %20) aren't unescaped indiscriminately. !5770 (ewiltshi) - Convert switch icon into icon font (ClemMakesApps) @@ -174,8 +175,6 @@ v 8.10.0 - Add an API for downloading latest successful build from a particular branch or tag. !5347 - Avoid data-integrity issue when cleaning up repository archive cache. - Add link to profile to commit avatar. !5163 (winniehell) - - Remove pinTo from Flash and make inline flash messages look nicer !4854 (winniehell) - - Update to Ruby 2.3.1. !4948 - Wrap code blocks on Activies and Todos page. !4783 (winniehell) - Align flash messages with left side of page content. !4959 (winniehell) - Display tooltip for "Copy to Clipboard" button. !5164 (winniehell)