references/openproject
1
0
Fork 0
mirror of https://github.com/opf/openproject.git synced 2026-06-14 03:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/12.0' into dev

Browse Source
This commit is contained in:
ulferts
2021-11-25 14:15:38 +01:00
parent 8a35d3b10b 31046f8256
commit 0ae306bbbe
12 changed files with 37 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ruby-version
+1 -1
View File
@@ -1 +1 @@
2.7.4
2.7.5
Gemfile
+1 -1
View File
@@ -28,7 +28,7 @@
source 'https://rubygems.org'
ruby '~> 2.7.4'
ruby '~> 2.7.5'
gem 'actionpack-xml_parser', '~> 2.0.0'
gem 'activemodel-serializers-xml', '~> 1.0.1'
Gemfile.lock
+1 -1
View File
@@ -1141,7 +1141,7 @@ DEPENDENCIES
with_advisory_lock (~> 4.6.0)
RUBY VERSION
ruby 2.7.4p191
ruby 2.7.5p203
BUNDLED WITH
2.1.4
config/locales/en.yml
+1
View File
@@ -518,6 +518,7 @@ en:
url: "URL"
role:
assignable: "Work packages can be assigned to users and groups in possession of this role in the respective project"
permissions: "Permissions"
time_entry:
activity: "Activity"
hours: "Hours"
docker/ci/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM ruby:2.7.4-buster
FROM ruby:2.7.5-buster
MAINTAINER operations@openproject.com
ENV NODE_VERSION="14.17.0"
docker/dev/backend/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM ruby:2.7.4-buster as develop
FROM ruby:2.7.5-buster as develop
MAINTAINER operations@openproject.com
ARG DEV_UID=1000
docker/prod/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM ruby:2.7.4-buster
FROM ruby:2.7.5-buster
MAINTAINER operations@openproject.com
# Allow platform-specific additions. Valid values are: on-prem,saas,bahn
docs/development/development-environment-docker/README.md
+1 -1
View File
@@ -192,7 +192,7 @@ an error like the following when running `bin/compose setup`:
```
Creating core_backend_run ... done
Your Ruby version is 2.7.1, but your Gemfile specified ~> 2.7.4
Your Ruby version is 2.7.1, but your Gemfile specified ~> 2.7.5
```
This means that the current image is out-dated. You can update it like this:
docs/development/development-environment-osx/README.md
+4 -4
View File
@@ -32,20 +32,20 @@ $ rbenv init
### Installing ruby-2.7
With both installed, we can now install the actual ruby version 2.7. You can check available ruby versions with `rbenv install --list`.
At the time of this writing, the latest stable version is `2.7.4`, which we also require.
At the time of this writing, the latest stable version is `2.7.5`, 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
and install that version.
```bash
# Install the required version as read from the Gemfile
rbenv install 2.7.4
rbenv install 2.7.5
```
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
rbenv global 2.7.4
rbenv global 2.7.5
```
You also need to install [bundler](https://github.com/bundler/bundler/), the ruby gem bundler.
@@ -116,7 +116,7 @@ You should now have an active ruby and node installation. Verify that it works w
```bash
$ ruby --version
ruby 2.7.4p191 (2021-07-07 revision a21a3b7d23) [x86_64-linux]
ruby 2.7.5p203 (2021-07-07 revision a21a3b7d23) [x86_64-linux]
$ bundler --version
Bundler version 2.1.4
docs/development/development-environment-ubuntu/README.md
+4 -4
View File
@@ -54,20 +54,20 @@ git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
### Installing ruby-2.7
With both installed, we can now install the actual ruby version 2.7. You can check available ruby versions with `rbenv install --list`.
At the time of this writing, the latest stable version is `2.7.4`, which we also require.
At the time of this writing, the latest stable version is `2.7.5`, 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
and install that version.
```bash
# Install the required version as read from the Gemfile
rbenv install 2.7.4
rbenv install 2.7.5
```
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
rbenv global 2.7.4
rbenv global 2.7.5
rbenv rehash
```
@@ -155,7 +155,7 @@ You should now have an active ruby and node installation. Verify that it works w
```bash
ruby --version
ruby 2.7.4p191 (2021-07-07 revision a21a3b7d23) [x86_64-linux]
ruby 2.7.5p203 (2021-07-07 revision a21a3b7d23) [x86_64-linux]
bundler --version
Bundler version 2.1.4
docs/installation-and-operations/installation/manual/README.md
+3 -3
View File
@@ -106,16 +106,16 @@ time to finish.
[openproject@host] source ~/.profile
[openproject@host] git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
[openproject@host] rbenv install 2.7.4
[openproject@host] rbenv install 2.7.5
[openproject@host] rbenv rehash
[openproject@host] rbenv global 2.7.4
[openproject@host] rbenv global 2.7.5
```
To check our Ruby installation we run `ruby --version`. It should output
something very similar to:
```
ruby 2.7.4p191 (2021-07-07 revision a21a3b7d23) [x86_64-linux]
ruby 2.7.5p203 (2021-07-07 revision a21a3b7d23) [x86_64-linux]
```
## Installation of Node
frontend/package-lock.json
Generated
+18 -54
View File
@@ -3897,9 +3897,9 @@
"dev": true
},
"@types/hast": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.2.tgz",
"integrity": "sha512-Op5W7jYgZI7AWKY5wQ0/QNMzQM7dGQPyW1rXKNiymVCy5iTfdPuGu4HhYNOM2sIv8gUfIuIdcYlXmAepwaowow==",
"version": "2.3.4",
"resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz",
"integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==",
"requires": {
"@types/unist": "*"
}
@@ -4037,9 +4037,9 @@
}
},
"@types/unist": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.5.tgz",
"integrity": "sha512-wnra4Vw9dopnuybR6HBywJ/URYpYrKLoepBTEtgfJup8Ahoi2zJECPP2cwiXp7btTvOT2CULv87aQRA4eZSP6g=="
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
"integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="
},
"@types/urijs": {
"version": "1.19.6",
@@ -14345,14 +14345,14 @@
}
},
"react-syntax-highlighter": {
"version": "15.4.4",
"resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.4.tgz",
"integrity": "sha512-PsOFHNTzkb3OroXdoR897eKN5EZ6grht1iM+f1lJSq7/L0YVnkJaNVwC3wEUYPOAmeyl5xyer1DjL6MrumO6Zw==",
"version": "15.4.5",
"resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.4.5.tgz",
"integrity": "sha512-RC90KQTxZ/b7+9iE6s9nmiFLFjWswUcfULi4GwVzdFVKVMQySkJWBuOmJFfjwjMVCo0IUUuJrWebNKyviKpwLQ==",
"requires": {
"@babel/runtime": "^7.3.1",
"highlight.js": "^10.4.1",
"lowlight": "^1.17.0",
"prismjs": "^1.22.0",
"prismjs": "^1.25.0",
"refractor": "^3.2.0"
}
},
@@ -14527,20 +14527,13 @@
"integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="
},
"refractor": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/refractor/-/refractor-3.4.0.tgz",
"integrity": "sha512-dBeD02lC5eytm9Gld2Mx0cMcnR+zhSnsTfPpWqFaMgUMJfC9A6bcN3Br/NaXrnBJcuxnLFR90k1jrkaSyV8umg==",
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/refractor/-/refractor-3.5.0.tgz",
"integrity": "sha512-QwPJd3ferTZ4cSPPjdP5bsYHMytwWYnAN5EEnLtGvkqp/FCCnGsBgxrm9EuIDnjUC3Uc/kETtvVi7fSIVC74Dg==",
"requires": {
"hastscript": "^6.0.0",
"parse-entities": "^2.0.0",
"prismjs": "~1.24.0"
},
"dependencies": {
"prismjs": {
"version": "1.24.1",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.24.1.tgz",
"integrity": "sha512-mNPsedLuk90RVJioIky8ANZEwYm5w9LcvCXrxHlwf4fNVSn8jEipMybMkWUyyF0JhnC+C4VcOVSBuHRKs1L5Ow=="
}
"prismjs": "~1.25.0"
}
},
"regenerate": {
@@ -18069,40 +18062,11 @@
"dev": true
},
"wide-align": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
"integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
"requires": {
"string-width": "^1.0.2 || 2"
},
"dependencies": {
"ansi-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
},
"is-fullwidth-code-point": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
},
"string-width": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
"requires": {
"is-fullwidth-code-point": "^2.0.0",
"strip-ansi": "^4.0.0"
}
},
"strip-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"requires": {
"ansi-regex": "^3.0.0"
}
}
"string-width": "^1.0.2 || 2 || 3 || 4"
}
},
"wildcard": {