TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7028 from opf/fix/bump_ruby_to_2_6_1

Browse Source 
bump ruby to 2.6.1

[ci skip]
pull/7033/head
Oliver Günther 6 years ago committed by GitHub
parent abf121cd19 0257b31ebe
commit 23f96ff07f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 40 additions and 36 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      .travis.yml
  2. 2
      Dockerfile
  3. 4
      Gemfile
  4. 8
      Gemfile.lock
  5. 20
      docs/development/development-environment-osx.md
  6. 20
      docs/development/development-environment-ubuntu.md
  7. 6
      docs/installation/manual/README.md
  8. 2
      docs/installation/system-requirements.md
  9. 2
      modules/costs/spec/features/work_package_filter_spec.rb
  10. 2
      spec/support/webmock.rb

2
.travis.yml
Unescape View File

@ -29,7 +29,7 @@
language: ruby language: ruby
rvm: rvm:
- 2.5.1 - 2.6.1
sudo: required sudo: required
dist: trusty dist: trusty

2
Dockerfile
Unescape View File

@ -1,4 +1,4 @@
FROM ruby:2.5-stretch FROM ruby:2.6-stretch
ENV NODE_VERSION="10.15.0" ENV NODE_VERSION="10.15.0"
ENV BUNDLER_VERSION="2.0.1" ENV BUNDLER_VERSION="2.0.1"

4
Gemfile
Unescape View File

@ -28,7 +28,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '~> 2.5.1' ruby '~> 2.6.1'
gem 'actionpack-xml_parser', '~> 2.0.0' gem 'actionpack-xml_parser', '~> 2.0.0'
gem 'activemodel-serializers-xml', '~> 1.0.1' gem 'activemodel-serializers-xml', '~> 1.0.1'
@ -229,7 +229,7 @@ group :test do
gem 'fuubar', '~> 2.3.2' gem 'fuubar', '~> 2.3.2'
gem 'timecop', '~> 0.9.0' gem 'timecop', '~> 0.9.0'
gem 'webmock', '~> 3.1.0', require: false gem 'webmock', '~> 3.5.0', require: false
gem 'equivalent-xml', '~> 0.6' gem 'equivalent-xml', '~> 0.6'
gem 'json_spec', '~> 1.1.4' gem 'json_spec', '~> 1.1.4'

8
Gemfile.lock
Unescape View File

@ -464,7 +464,7 @@ GEM
rack-accept rack-accept
virtus (>= 1.0.0) virtus (>= 1.0.0)
gravatar_image_tag (1.2.0) gravatar_image_tag (1.2.0)
hashdiff (0.3.7) hashdiff (0.3.8)
hashery (2.1.2) hashery (2.1.2)
hashie (3.6.0) hashie (3.6.0)
health_check (3.0.0) health_check (3.0.0)
@ -862,7 +862,7 @@ GEM
webfinger (1.1.0) webfinger (1.1.0)
activesupport activesupport
httpclient (>= 2.4) httpclient (>= 2.4)
webmock (3.1.0) webmock (3.5.1)
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff hashdiff
@ -1028,11 +1028,11 @@ DEPENDENCIES
unicorn-worker-killer unicorn-worker-killer
warden (~> 1.2) warden (~> 1.2)
warden-basic_auth (~> 0.2.1) warden-basic_auth (~> 0.2.1)
webmock (~> 3.1.0) webmock (~> 3.5.0)
will_paginate (~> 3.1.0) will_paginate (~> 3.1.0)
RUBY VERSION RUBY VERSION
ruby 2.5.1p57 ruby 2.6.1p33
BUNDLED WITH BUNDLED WITH
2.0.1 2.0.1

20
docs/development/development-environment-osx.md
Unescape View File

@ -13,9 +13,9 @@ If you find any bugs or you have any recommendations for improving this tutorial
We'll use [homebrew](https://brew.sh/) to install most of our requirements. Please install that first using the guide on their homepage. We'll use [homebrew](https://brew.sh/) to install most of our requirements. Please install that first using the guide on their homepage.
## Install Ruby 2.5. ## Install Ruby 2.6.
Use [rbenv](https://github.com/rbenv/rbenv) and [ruby-build](https://github.com/rbenv/ruby-build#readme) to install Ruby 2.5.0. Use [rbenv](https://github.com/rbenv/rbenv) and [ruby-build](https://github.com/rbenv/ruby-build#readme) to install Ruby 2.6.1.
**Install rbenv and ruby-build** **Install rbenv and ruby-build**
rbenv is a ruby version manager that lets you quickly switch between ruby versions. rbenv is a ruby version manager that lets you quickly switch between ruby versions.
@ -28,23 +28,23 @@ $ brew install rbenv ruby-build
$ rbenv init $ rbenv init
``` ```
**Installing ruby-2.5** **Installing ruby-2.6**
With both installed, we can now install the actual ruby version 2.5. You can check available ruby versions with `rbenv install --list`. With both installed, we can now install the actual ruby version 2.6. You can check available ruby versions with `rbenv install --list`.
At the time of this writing, the latest stable version is `2.5.0`, which we also require. At the time of this writing, the latest stable version is `2.6.1`, which we also require.
We suggest you install the version we require in the [Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile). Search for the `ruby '~> X.Y.Z'` line We suggest you install the version we require in the [Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile). Search for the `ruby '~> X.Y.Z'` line
and install that version. and install that version.
```bash ```bash
# Install the required version as read from the Gemfile # Install the required version as read from the Gemfile
[dev@ubuntu]# rbenv install 2.5.0 [dev@ubuntu]# rbenv install 2.6.1
``` ```
This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to globally activate this version This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to globally activate this version
```bash ```bash
[dev@ubuntu]# rbenv global 2.5.0 [dev@ubuntu]# rbenv global 2.6.1
``` ```
You also need to install [bundler](https://github.com/bundler/bundler/), the ruby gem bundler. You also need to install [bundler](https://github.com/bundler/bundler/), the ruby gem bundler.
@ -108,13 +108,13 @@ You should now have an active ruby and node installation. Verify that it works w
```bash ```bash
$ ruby --version $ ruby --version
ruby 2.5.0p0 (2017-12-25 revision 61468) [x86_64-darwin16] ruby 2.6.1p33 (2019-01-30 revision 66950) [x86_64-darwin16]
$ bundler --version $ bundler --version
Bundler version 1.16.1 Bundler version 2.0.1
$ npm --version $ npm --version
3.10.10 6.7.0
``` ```
# Install OpenProject # Install OpenProject

20
docs/development/development-environment-ubuntu.md
Unescape View File

@ -20,9 +20,9 @@ We need an active Ruby and Node JS environment to run OpenProject. To this end,
[dev@ubuntu]# sudo apt-get install git curl build-essential zlib1g-dev libyaml-dev libssl-dev libmysqlclient-dev libpq-dev libsqlite3-dev libreadline-dev libffi6 [dev@ubuntu]# sudo apt-get install git curl build-essential zlib1g-dev libyaml-dev libssl-dev libmysqlclient-dev libpq-dev libsqlite3-dev libreadline-dev libffi6
``` ```
## Install Ruby 2.5. ## Install Ruby 2.6.
Use [rbenv](https://github.com/rbenv/rbenv) and [ruby-build](https://github.com/rbenv/ruby-build#readme) to install Ruby 2.5. Use [rbenv](https://github.com/rbenv/rbenv) and [ruby-build](https://github.com/rbenv/ruby-build#readme) to install Ruby 2.6.
**Install rbenv** **Install rbenv**
@ -51,23 +51,23 @@ ruby-build is an addon to rbenv that installs ruby versions
[dev@ubuntu]# git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build [dev@ubuntu]# git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
``` ```
**Installing ruby-2.5** **Installing ruby-2.6**
With both installed, we can now install the actual ruby version 2.5. You can check available ruby versions with `rbenv install --list`. With both installed, we can now install the actual ruby version 2.6. You can check available ruby versions with `rbenv install --list`.
At the time of this writing, the latest stable version is `2.5.0`, which we also require. At the time of this writing, the latest stable version is `2.6.1`, which we also require.
We suggest you install the version we require in the [Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile). Search for the `ruby '~> X.Y.Z'` line We suggest you install the version we require in the [Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile). Search for the `ruby '~> X.Y.Z'` line
and install that version. and install that version.
```bash ```bash
# Install the required version as read from the Gemfile # Install the required version as read from the Gemfile
[dev@ubuntu]# rbenv install 2.5.1 [dev@ubuntu]# rbenv install 2.6.1
``` ```
This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to globally activate this version This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to globally activate this version
```bash ```bash
[dev@ubuntu]# rbenv global 2.5.1 [dev@ubuntu]# rbenv global 2.6.1
``` ```
You also need to install [bundler](https://github.com/bundler/bundler/), the ruby gem bundler. You also need to install [bundler](https://github.com/bundler/bundler/), the ruby gem bundler.
@ -144,13 +144,13 @@ You should now have an active ruby and node installation. Verify that it works w
```bash ```bash
[dev@ubuntu]# ruby --version [dev@ubuntu]# ruby --version
ruby 2.5.1p57 (2017-12-25 revision 61468) [x86_64-darwin16] ruby 2.6.1p33 (2019-01-30 revision 66950) [x86_64-darwin16]
[dev@ubuntu]# bundler --version [dev@ubuntu]# bundler --version
Bundler version 1.16.1 Bundler version 2.0.1
[dev@ubuntu]# npm --version [dev@ubuntu]# npm --version
6.4.1 6.7.0
``` ```
# Install OpenProject # Install OpenProject

6
docs/installation/manual/README.md
Unescape View File

@ -156,16 +156,16 @@ time to finish.
[openproject@host] source ~/.profile [openproject@host] source ~/.profile
[openproject@host] git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build [openproject@host] git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
[openproject@host] rbenv install 2.5.3 [openproject@host] rbenv install 2.6.1
[openproject@host] rbenv rehash [openproject@host] rbenv rehash
[openproject@host] rbenv global 2.5.3 [openproject@host] rbenv global 2.6.1
``` ```
To check our Ruby installation we run `ruby --version`. It should output To check our Ruby installation we run `ruby --version`. It should output
something very similar to: something very similar to:
``` ```
ruby 2.5.3pXYZ (....) [x86_64-linux] ruby 2.6.1pXYZ (....) [x86_64-linux]
``` ```
## Installation of Node ## Installation of Node

2
docs/installation/system-requirements.md
Unescape View File

@ -25,7 +25,7 @@ provide any official support for them.
### Dependencies ### Dependencies
* __Runtime:__ [Ruby](https://www.ruby-lang.org/en/) Version = 2.5.x * __Runtime:__ [Ruby](https://www.ruby-lang.org/en/) Version = 2.6.x
* __Webserver:__ [Apache](http://httpd.apache.org/) * __Webserver:__ [Apache](http://httpd.apache.org/)
or [nginx](http://nginx.org/en/docs/) or [nginx](http://nginx.org/en/docs/)
* __Application server:__ [Phusion Passenger](https://www.phusionpassenger.com/) * __Application server:__ [Phusion Passenger](https://www.phusionpassenger.com/)

2
modules/costs/spec/features/work_package_filter_spec.rb
Unescape View File

@ -73,6 +73,8 @@ describe 'Filter by budget', js: true do
wp_table.save_as('Some query name') wp_table.save_as('Some query name')
wp_table.expect_and_dismiss_notification message: 'Successful creation.'
filters.remove_filter 'costObject' filters.remove_filter 'costObject'
wp_table.expect_work_package_listed work_package_with_budget, work_package_without_budget wp_table.expect_work_package_listed work_package_with_budget, work_package_without_budget

2
spec/support/webmock.rb
Unescape View File

@ -29,10 +29,12 @@
require 'webmock/rspec' require 'webmock/rspec'
RSpec.configure do |config| RSpec.configure do |config|
config.before(:suite) do
# As we're using WebMock to mock and test remote HTTP requests, # As we're using WebMock to mock and test remote HTTP requests,
# we require specs to selectively enable mocking of Net::HTTP et al. when the example desires. # we require specs to selectively enable mocking of Net::HTTP et al. when the example desires.
# Otherwise, all requests are being mocked by default. # Otherwise, all requests are being mocked by default.
WebMock.disable! WebMock.disable!
end
# When we enable webmock, no connections other than stubbed ones are allowed. # When we enable webmock, no connections other than stubbed ones are allowed.
# We will exempt local connections from this block, since selenium etc. # We will exempt local connections from this block, since selenium etc.

Write Preview
Loading…
Cancel
Save