Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Commit 9474629

Browse files
Release OpenProject 8.2.0
2 parents daf572f + b02398f commit 9474629

File tree

2,418 files changed

+154344
-19331
lines changed

Some content is hidden

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

2,418 files changed

+154344
-19331
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ npm-debug.log*
4141
/tmp
4242
*.swp
4343

44+
# Ignore Visual Studio Code files
45+
/.vscode
46+
4447
# Ignore RubyMine files
4548
/.idea
4649
/frontend/.idea

.travis.yml

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,6 @@
2626
# See doc/COPYRIGHT.rdoc for more details.
2727
#++
2828

29-
30-
###################################
31-
#
32-
# This file was generated by
33-
# openproject-devkit.
34-
#
35-
# Do not modify this file directly!
36-
#
37-
###################################
38-
3929
language: ruby
4030

4131
rvm:
@@ -189,40 +179,37 @@ jobs:
189179
script:
190180
- bash script/ci/setup.sh plugins:units mysql
191181
- bash script/ci/runner.sh plugins:units 1 1
182+
if: head_branch !~ /^core\//
192183
- stage: test
193184
name: 'plugins:units (1/1) - postgres'
194185
script:
195186
- bash script/ci/setup.sh plugins:units postgres
196187
- bash script/ci/runner.sh plugins:units 1 1
188+
if: head_branch !~ /^core\//
197189
- stage: test
198190
name: 'plugins:features (1/1) - mysql'
199191
script:
200192
- bash script/ci/setup.sh plugins:features mysql
201193
- bash script/ci/runner.sh plugins:features 1 1
194+
if: head_branch !~ /^core\//
202195
- stage: test
203196
name: 'plugins:features (1/1) - postgres'
204197
script:
205198
- bash script/ci/setup.sh plugins:features postgres
206199
- bash script/ci/runner.sh plugins:features 1 1
200+
if: head_branch !~ /^core\//
207201
- stage: test
208202
name: 'plugins:cucumber (1/1) - mysql'
209203
script:
210204
- bash script/ci/setup.sh plugins:cucumber mysql
211205
- bash script/ci/runner.sh plugins:cucumber 1 1
206+
if: head_branch !~ /^core\//
212207
- stage: test
213208
name: 'plugins:cucumber (1/1) - postgres'
214209
script:
215210
- bash script/ci/setup.sh plugins:cucumber postgres
216211
- bash script/ci/runner.sh plugins:cucumber 1 1
217-
218-
notifications:
219-
email: false
220-
slack:
221-
on_success: change
222-
on_failure: always
223-
on_pull_requests: false
224-
rooms:
225-
- secure: DzTFQBORAgS6ncPWuP6j60rDyHq/Fw4STPPi8CyQCbpNnqJKtbznJJqZH5JQMHAHE7ak2awnGwK3x4Ls0SmSUOxxKn1r3LGNP6INdvHbf7YG7Vk247+uau4xOx/JDS0ueb9VwYyHvD8TM9Jh1BYaPvCmvTh9WBWCnlWFteAyGT8cpAtMtVRK/GFS4QWukG/uBo/lWI/Lw4DU5jPZonj/mW9XconT3qCqHsRZ8LgIF/3zOzO2b6N9R2mbyHmOqO+X36XsFL5lrfH5A7Z9ZZ5UZNqzvhjf/Ft2NLLv9RVQMleFlGEavCcr5sCXQRrb6ffmKKJoVilopvmpuWaVRkVqx8Wl6qCjXUefeiHXCM6+HWFO9I+xvh59e/Dl4mPASCQOamOuNjAva2JgpxP1aifDvt2jdAjPagf2Ss5csRsR2pq5VR/eyDu8U03hZSzphDqSgCqxRJtBv50V7KByTFO6u3AefYw71EZYX6khKFCZZDQ+GAZLdZGvhZXzecejMJETTz+f8m8Nd+M+uidCnND+vDKoZDxI8lSDE7zYdJovpf2M2vUQbBUgKtKOfoY22YqG3O77/HhrVrS8hoJAfdE/wSGYktYQre90VWkekBiU57/PXqSU2hnRFGytWonfNi1M89Ib5F4Vsr/AuBvXx2//PkOpiZwJFC/LT9d394Ls3Mo=
212+
if: head_branch !~ /^core\//
226213

227214
addons:
228215
chrome: stable

Dockerfile

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ RUN apt-get update -qq && \
1818
poppler-utils \
1919
unrtf \
2020
tesseract-ocr \
21-
catdoc \
22-
pandoc && \
21+
catdoc && \
2322
apt-get clean && rm -rf /var/lib/apt/lists/*
2423

2524
# using /home/app since npm cache and other stuff will be put there when running npm install
@@ -32,8 +31,11 @@ WORKDIR $APP_PATH
3231

3332
COPY Gemfile ./Gemfile
3433
COPY Gemfile.* ./
35-
COPY vendored-plugins ./vendored-plugins
36-
RUN bundle install --jobs 8 --retry 3 --with docker
34+
COPY modules ./modules
35+
# OpenProject::Version is required by module versions in gemspecs
36+
RUN mkdir -p lib/open_project
37+
COPY lib/open_project/version.rb ./lib/open_project/
38+
RUN bundle install --deployment --with="docker opf_plugins" --without="test development" --jobs=8 --retry=3
3739

3840
# Then, npm install node modules
3941
COPY package.json /tmp/npm/package.json
@@ -48,9 +50,22 @@ RUN cp docker/Procfile .
4850
RUN cp packaging/conf/database.yml config/
4951
RUN sed -i "s|Rails.groups(:opf_plugins)|Rails.groups(:opf_plugins, :docker)|" config/application.rb
5052

53+
# Ensure we can write in /tmp/op_uploaded_files (cf. #29112)
54+
RUN mkdir -p /tmp/op_uploaded_files/
55+
RUN chown -R $APP_USER:$APP_USER /tmp/op_uploaded_files/
56+
57+
# Allow uploading avatars w/ postgres
58+
RUN chown -R $APP_USER:$APP_USER $APP_DATA
59+
60+
# Re-use packager database.yml
61+
COPY packaging/conf/database.yml ./config/database.yml
62+
5163
# Run the npm postinstall manually after it was copied
5264
RUN DATABASE_URL=sqlite3:///tmp/db.sqlite3 SECRET_TOKEN=foobar RAILS_ENV=production bundle exec rake assets:precompile
5365

66+
# Include pandoc
67+
RUN DATABASE_URL=sqlite3:///tmp/db.sqlite3 RAILS_ENV=production bundle exec rails runner "puts ::OpenProject::TextFormatting::Formats::Markdown::PandocDownloader.check_or_download!"
68+
5469
CMD ["./docker/web"]
5570
ENTRYPOINT ["./docker/entrypoint.sh"]
5671
VOLUME ["$APP_DATA"]

Gemfile

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ruby '~> 2.5.1'
3333
gem 'actionpack-xml_parser', '~> 2.0.0'
3434
gem 'activemodel-serializers-xml', '~> 1.0.1'
3535
gem 'activerecord-session_store', '~> 1.1.0'
36-
gem 'rails', '~> 5.1.5'
36+
gem 'rails', '~> 5.1.6'
3737
gem 'responders', '~> 2.4'
3838

3939
gem 'rubytree', git: 'https://github.com/dr0verride/RubyTree.git', ref: '06f53ee'
@@ -195,7 +195,7 @@ group :test do
195195

196196
# Test prof provides factories from code
197197
# and other niceties
198-
gem 'test-prof', '~> 0.4.0'
198+
gem 'test-prof', '~> 0.7.3'
199199

200200
gem 'cucumber', '~> 3.0.0'
201201
gem 'cucumber-rails', '~> 1.6.0', require: false
@@ -217,11 +217,11 @@ group :test do
217217
# brings back testing for 'assigns' and 'assert_template' extracted in rails 5
218218
gem 'rails-controller-testing', '~> 1.0.2'
219219

220-
gem 'capybara', '~> 3.0.0'
220+
gem 'capybara', '~> 3.11.1'
221221
gem 'capybara-screenshot', '~> 1.0.17'
222222
gem 'capybara-select2', git: 'https://github.com/goodwill/capybara-select2', ref: '585192e'
223-
gem 'chromedriver-helper', '~> 1.2.0'
224-
gem 'selenium-webdriver', '~> 3.11'
223+
gem 'chromedriver-helper', '~> 2.1.0'
224+
gem 'selenium-webdriver', '~> 3.14'
225225

226226
gem 'fuubar', '~> 2.3.1'
227227
gem 'timecop', '~> 0.9.0'
@@ -250,6 +250,13 @@ end
250250

251251
group :development, :test do
252252
gem 'thin', '~> 1.7.2'
253+
gem 'ruby-prof', require: false
254+
gem 'puma', '~> 3.11.3'
255+
256+
# Tracing and profiling gems
257+
gem 'rack-mini-profiler', require: false
258+
gem 'flamegraph', require: false
259+
gem 'stackprof', require: false
253260

254261
gem 'pry-rails', '~> 0.3.6'
255262
gem 'pry-stack_explorer', '~> 0.4.9.2'
@@ -290,7 +297,7 @@ group :docker, optional: true do
290297
end
291298

292299
# Load Gemfile.local, Gemfile.plugins, plugins', and custom Gemfiles
293-
gemfiles = Dir.glob File.expand_path('../{Gemfile.local,Gemfile.plugins,lib/plugins/*/Gemfile}',
300+
gemfiles = Dir.glob File.expand_path('../{Gemfile.plugins,Gemfile.modules,Gemfile.local,lib/plugins/*/Gemfile}',
294301
__FILE__)
295302
gemfiles << ENV['CUSTOM_PLUGIN_GEMFILE'] unless ENV['CUSTOM_PLUGIN_GEMFILE'].nil?
296303
gemfiles.each do |file|

0 commit comments

Comments
 (0)