Skip to content

Commit 56ea0ab

Browse files
committed
Release OpenProject 11.1.0
2 parents da7175d + 3c73327 commit 56ea0ab

File tree

1,066 files changed

+11675
-23675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,066 files changed

+11675
-23675
lines changed

.codeclimate.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ checks:
2727
plugins:
2828
rubocop:
2929
enabled: true
30-
channel: rubocop-0-90
30+
channel: rubocop-1-4
3131
# Codeclimate uses brakeman 4.3.1 which does not support rails 6
3232
# Check https://docs.codeclimate.com/docs/brakeman for updates.
3333
brakeman:
@@ -57,7 +57,6 @@ ratings:
5757
paths:
5858
- app/**
5959
- config/**
60-
- features/**
6160
- frontend/**
6261
- lib/**
6362
- spec/**

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ ij_json_spaces_within_braces = false
452452
ij_json_spaces_within_brackets = false
453453
ij_json_wrap_long_lines = false
454454

455-
[{rcov,spec,rake,cucumber,rails,spork,capfile,gemfile,rakefile,guardfile,isolate,vagrantfile,Puppetfile,*.jbuilder,*.rbw,*.gemspec,*.thor,*.ru,*.rb,*.rake}]
455+
[{rcov,spec,rake,rails,spork,capfile,gemfile,rakefile,guardfile,isolate,vagrantfile,Puppetfile,*.jbuilder,*.rbw,*.gemspec,*.thor,*.ru,*.rb,*.rake}]
456456
indent_size = 2
457457
tab_width = 2
458458
ij_continuation_indent_size = 2

.env.sample renamed to .env.example

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,20 @@
3030
# you can override some default settings that foreman will use
3131
# to start OpenProject
3232

33-
# override the default bind address
34-
HOST=0.0.0.0
33+
# This is used to prevent people from using the new docker-compose file for automated installs
34+
LOCAL_DEV_CHECK=1
35+
36+
# This is the host from which you will be accessing the development servers locally
37+
PUBLIC_HOST=localhost
3538

36-
# override the default port
39+
HOST=0.0.0.0
3740
PORT=1337
41+
42+
DEV_UID=1000
43+
DEV_GID=1001
44+
45+
DB_HOST=db
46+
DB_PORT=5432
47+
DB_USERNAME=openproject
48+
DB_PASSWORD=openproject
49+
DB_DATABASE=openproject

.github/workflows/docker.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@master
17+
- name: Prepare docker files
18+
run: |
19+
cp ./docker/prod/Dockerfile ./Dockerfile
1720
- name: Build & Push
1821
id: build_and_push
1922
uses: elgohr/Publish-Docker-Github-Action@master
@@ -26,5 +29,5 @@ jobs:
2629
- name: Test
2730
run: |
2831
docker run -d -p 8080:80 -e SUPERVISORD_LOG_LEVEL=debug -e SECRET_KEY_BASE=secret ${{ steps.build_and_push.outputs.digest }}
29-
sleep 5
32+
sleep 15
3033
wget -O- --retry-connrefused http://localhost:8080/api/v3

.github/workflows/pullpreview.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ jobs:
2222
if: contains(github.ref, 'bim/') || contains(github.head_ref, 'bim/')
2323
run: |
2424
echo "OPENPROJECT_EDITION=bim" >> .env.pullpreview
25+
- name: Prepare docker-compose files
26+
run: |
27+
cp ./docker/pullpreview/docker-compose.yml ./docker-compose.pullpreview.yml
28+
cp ./docker/prod/Dockerfile ./Dockerfile
2529
- uses: pullpreview/action@v4
2630
with:
27-
admins: crohr,HDinger,machisuji,oliverguenther,ulferts,wielinde
31+
admins: crohr,HDinger,machisuji,oliverguenther,ulferts,wielinde,b12f
2832
always_on: dev
2933
compose_files: docker-compose.pullpreview.yml
3034
instance_type: medium_2_0

.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ npm-debug.log*
5151
/backup
5252
/.project
5353
/.loadpath
54+
55+
# Generated files
5456
/app/assets/javascripts/editor/*
5557
/app/assets/javascripts/locales/*.*
5658
/frontend/src/locales/*.js
@@ -84,19 +86,25 @@ npm-debug.log*
8486
/.rvmrc*
8587
/.ruby-gemset
8688
/.foreman
87-
/.env*
8889
.DS_Store
8990
.rspec
91+
9092
# coverage in plugins
9193
/lib/plugins/*/coverage
94+
9295
# asset cache
9396
/.sass-cache/
97+
9498
# Frontend debug log
9599
/frontend/npm-debug.log*
96100
/frontend/dist/
97101
/frontend/tests/*.gif
98102
node_modules/
103+
99104
# Ignore global package-lock.json that generates
100105
/package-lock.json
101106
plaintext.yml
102107
structure.sql
108+
109+
# Local development docker
110+
/.env

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,10 @@ jobs:
9191
- bash script/ci/runner.sh npm
9292

9393
- stage: test
94-
name: 'legacy specs + cukes (1/1)'
94+
name: 'legacy specs (1/1)'
9595
script:
9696
- bash script/ci/setup.sh spec_legacy
9797
- bash script/ci/runner.sh spec_legacy 1 1
98-
- bash script/ci/runner.sh plugins:cucumber 1 1
9998
- stage: test
10099
name: 'units (1/5)'
101100
script:

Gemfile

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ gem 'deckar01-task_list', '~> 2.3.1'
8383
# Requires escape-utils for faster escaping
8484
gem 'escape_utils', '~> 1.0'
8585
# Syntax highlighting used in html-pipeline with rouge
86-
gem 'rouge', '~> 3.23.0'
86+
gem 'rouge', '~> 3.25.0'
8787
# HTML sanitization used for html-pipeline
8888
gem 'sanitize', '~> 5.2.1'
8989
# HTML autolinking for mails and urls (replaces autolink)
@@ -99,7 +99,7 @@ gem 'date_validator', '~> 0.10.0'
9999
gem 'ruby-duration', '~> 3.2.0'
100100

101101
# provide compatible filesystem information for available storage
102-
gem 'sys-filesystem', '~> 1.3.3', require: false
102+
gem 'sys-filesystem', '~> 1.4.0', require: false
103103

104104
# Faster posix-compliant spawns for 8.0. conversions with pandoc
105105
gem 'posix-spawn', '~> 0.3.13', require: false
@@ -125,7 +125,7 @@ gem 'rack-attack', '~> 6.3.1'
125125
gem 'secure_headers', '~> 6.3.0'
126126

127127
# Browser detection for incompatibility checks
128-
gem 'browser', '~> 4.2.0'
128+
gem 'browser', '~> 5.1.0'
129129

130130
# Providing health checks
131131
gem 'okcomputer', '~> 1.18.1'
@@ -159,25 +159,25 @@ group :production do
159159
gem 'unicorn-worker-killer', require: false
160160
end
161161

162-
gem 'i18n-js', '~> 3.7.0'
162+
gem 'i18n-js', '~> 3.8.0'
163163
gem 'rails-i18n', '~> 6.0.0'
164164
gem 'sprockets', '~> 3.7.0'
165165

166166
# required by Procfile, for deployment on heroku or packaging with packager.io.
167167
# also, better than thin since we can control worker concurrency.
168168
gem 'unicorn'
169169

170-
gem 'puma', '~> 5.0.0' # used for development and optionally for production
170+
gem 'puma', '~> 5.1.0' # used for development and optionally for production
171171

172172
gem 'nokogiri', '~> 1.10.8'
173173

174174
gem 'carrierwave', '~> 1.3.1'
175175
gem 'carrierwave_direct', '~> 2.1.0'
176176
gem 'fog-aws'
177177

178-
gem 'aws-sdk-core', '~> 3.105.0'
178+
gem 'aws-sdk-core', '~> 3.107'
179179
# File upload via fog + screenshots on travis
180-
gem 'aws-sdk-s3', '~> 1.80.0'
180+
gem 'aws-sdk-s3', '~> 1.84'
181181

182182
gem 'openproject-token', '~> 2.1.1'
183183

@@ -198,14 +198,9 @@ group :test do
198198
# and other niceties
199199
gem 'test-prof', '~> 0.12.0'
200200

201-
gem 'cucumber', '~> 3.1.0'
202-
gem 'cucumber-rails', '~> 1.8.0', require: false
203201
gem 'database_cleaner', '~> 1.8'
204202
gem 'rack_session_access'
205-
gem 'rspec', '~> 3.9.0'
206-
# TODO: replace stub_model and mock_model by calls to factory or simple double
207-
# and remove this dependency
208-
gem 'rspec-activemodel-mocks', '~> 1.1.0', git: 'https://github.com/rspec/rspec-activemodel-mocks'
203+
gem 'rspec', '~> 3.10.0'
209204
# also add to development group, so "spec" rake task gets loaded
210205
gem 'rspec-rails', '~> 4.0.0', group: :development
211206

@@ -219,7 +214,7 @@ group :test do
219214
# brings back testing for 'assigns' and 'assert_template' extracted in rails 5
220215
gem 'rails-controller-testing', '~> 1.0.2'
221216

222-
gem 'capybara', '~> 3.33.0'
217+
gem 'capybara', '~> 3.34.0'
223218
gem 'capybara-screenshot', '~> 1.0.17'
224219
gem 'selenium-webdriver', '~> 3.14'
225220
gem 'webdrivers', '~> 4.4.1'
@@ -228,7 +223,7 @@ group :test do
228223
gem 'timecop', '~> 0.9.0'
229224

230225
# Mock backend requests (for ruby tests)
231-
gem 'webmock', '~> 3.9.1', require: false
226+
gem 'webmock', '~> 3.10.0', require: false
232227

233228
# Mock selenium requests through proxy (for feature tests)
234229
gem 'puffing-billy', '~> 2.4.0'
@@ -242,11 +237,11 @@ group :test do
242237
end
243238

244239
group :ldap do
245-
gem 'net-ldap', '~> 0.16.0'
240+
gem 'net-ldap', '~> 0.17.0'
246241
end
247242

248243
group :development do
249-
gem 'listen', '~> 3.2.1' # Use for event-based reloaders
244+
gem 'listen', '~> 3.3.0' # Use for event-based reloaders
250245

251246
gem 'faker'
252247
gem 'letter_opener'
@@ -279,20 +274,17 @@ group :development, :test do
279274
gem 'pry-stack_explorer', '~> 0.5.1'
280275

281276
# Dangerfile scanner on travis and locally
282-
gem 'danger', '~> 8.0.5'
277+
gem 'danger', '~> 8.2.0'
283278

284279
# Brakeman scanner
285-
gem 'brakeman', '~> 4.9.0'
280+
gem 'brakeman', '~> 4.10.0'
286281
gem 'danger-brakeman'
287282
end
288283

289-
gem 'bootsnap', '~> 1.4.5', require: false
284+
gem 'bootsnap', '~> 1.5.0', require: false
290285

291286
# API gems
292-
# Grape 1.4.0 has a bug which requires us to wait until 1.4.1 is released.
293-
# https://github.com/ruby-grape/grape/pull/2088
294-
# In 1.4.0, the Cache-Control will always be set to no-cache when sending a file.
295-
gem 'grape', '~> 1.3.0'
287+
gem 'grape', '~> 1.5.0'
296288
gem 'roar', '~> 1.1.0'
297289

298290
# CORS for API
@@ -307,7 +299,7 @@ platforms :mri, :mingw, :x64_mingw do
307299
end
308300

309301
# Support application loading when no database exists yet.
310-
gem 'activerecord-nulldb-adapter', '~> 0.4.0'
302+
gem 'activerecord-nulldb-adapter', '~> 0.5.0'
311303

312304
# Have application level locks on the database to have a mutex shared between workers/hosts.
313305
# We e.g. employ this to safeguard the creation of journals.
@@ -318,7 +310,7 @@ gem 'openproject-translations',
318310
git: 'https://github.com/opf/openproject-translations.git',
319311
branch: 'dev'
320312

321-
gem 'newrelic_rpm', '~> 6.9.0.363'
313+
gem 'newrelic_rpm'
322314

323315
# Load Gemfile.local, Gemfile.plugins, plugins', and custom Gemfiles
324316
gemfiles = Dir.glob File.expand_path('../{Gemfile.plugins,Gemfile.modules,Gemfile.local,lib/plugins/*/Gemfile}',

0 commit comments

Comments
 (0)