Skip to content
Snippets Groups Projects

Update Ruby version to 2.2.4 (latest previous stable) and update docs

Merged James Lopez requested to merge jameslopez/gitlab-ce:update-ruby-2.2.4 into master

Tests and issues added to https://github.com/gitlabhq/gitlabhq/issues/8696 were all fine after the upgrade.

Main issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/3340

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • James Lopez Title changed from Update Ruby version to 2.2.4 (latest previous stable) and update docs to WIP: Update Ruby version to 2.2.4 (latest previous stable) and update docs

    Title changed from Update Ruby version to 2.2.4 (latest previous stable) and update docs to WIP: Update Ruby version to 2.2.4 (latest previous stable) and update docs

  • Author Maintainer

    @ayufan Thanks! Trying that now.. Would this introduce any significant overhead to the servers or would it be just fine?

    @DouweM am I safe to remove things like rubocop, brakeman, flog, flay and teaspoon for 2.1? It looks to me that they should be covered with the run in 2.2.

  • @jameslopez It will increase the load, but this will be resolved by scaling up our infrastracture. We should run ruby:2.1 tests on master only I think.

  • Author Maintainer

    @ayufan thanks! that makes sense 👍

  • James Lopez Added 1 commit:

    Added 1 commit:

    • b8ed5789 - update gitlab ci settings to include ruby 2.1 images
  • James Lopez Added 87 commits:

    Added 87 commits:

    • b8ed5789...a93f7099 - 86 commits from branch gitlab-org:master
    • 683770f3 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4
  • James Lopez Added 2 commits:

    Added 2 commits:

    • e862af95 - merge spec and spinach jobs
    • 47e0d6b1 - updated README to include Ruby 2.1
  • 134 134 - ruby
    135 135 - mysql
    136 136 allow_failure: true
    137
    138 # Ruby 2.1 jobs
    139
    140 spec:ruby21:
    141 image: ruby:2.1
    142 script:
    143 - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
  • James Lopez Title changed from WIP: Update Ruby version to 2.2.4 (latest previous stable) and update docs to Update Ruby version to 2.2.4 (latest previous stable) and update docs

    Title changed from WIP: Update Ruby version to 2.2.4 (latest previous stable) and update docs to Update Ruby version to 2.2.4 (latest previous stable) and update docs

  • Reassigned to @DouweM

  • Author Maintainer

    ready to be reviewed again :)

  • Douwe Maan Enabled an automatic merge when the build for jameslopez/gitlab-ce@47e0d6b16242cef440244e7d31f1310dea42f5ef succeeds

    Enabled an automatic merge when the build for jameslopez/gitlab-ce@47e0d6b16242cef440244e7d31f1310dea42f5ef succeeds

  • Douwe Maan Status changed to merged

    Status changed to merged

  • Douwe Maan mentioned in commit f025f80d

    mentioned in commit f025f80d

  • This MR broke the build https://gitlab.com/gitlab-org/gitlab-ce/commit/f025f80d5c6f84639b058533ee00c72a7b65918f/builds

    The issue seems to be that rubocop complains about syntax in ruby 2.2 but the fix actually breaks GitLab for ruby 2.1.

  • mentioned in issue #12801 (closed)

  • mentioned in issue #13252 (closed)

  • mentioned in issue #14286 (moved)

  • Please register or sign in to reply
    Loading