Permalink
Browse files

Release OpenProject Community Edition v6.1.0

  • Loading branch information...
2 parents e6352bc + 2f4f678 commit f1ee5ba4ac891b953f4271ad2f0d579b171550c4 @oliverguenther oliverguenther committed Nov 9, 2016
Showing 1,602 changed files with 49,750 additions and 30,238 deletions.
View
@@ -1,8 +1,7 @@
AllCops:
- TargetRubyVersion: 2.1
+ TargetRubyVersion: 2.2
Exclude:
- db/schema.rb
- - lib/plugins/rfpdf/**/*
AccessorMethodName:
Enabled: false
@@ -31,15 +30,6 @@ Attr:
BlockNesting:
Enabled: false
-BlockDelimiters:
- Enabled: true
- EnforcedStyle: semantic
- IgnoredMethods:
- - default_scope
-
-Blocks:
- Enabled: false
-
CaseEquality:
Enabled: false
@@ -74,7 +64,7 @@ CyclomaticComplexity:
Delegate:
Enabled: false
-DeprecatedHashMethods:
+PreferredHashMethods:
Enabled: false
Documentation:
View
@@ -29,13 +29,13 @@
language: ruby
rvm:
- - 2.2.3
+ - 2.2.5
sudo: false
cache:
- - bundler: true
- - directories:
+ bundler: true
+ directories:
- frontend/node_modules
- frontend/bower_components
@@ -56,42 +56,31 @@ env:
matrix:
- "TEST_SUITE=npm"
- - "TEST_SUITE=spec_legacy DB=mysql GROUP_SIZE=2 GROUP=1"
- - "TEST_SUITE=spec_legacy DB=mysql GROUP_SIZE=2 GROUP=2"
- - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=3 GROUP=1"
- - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=3 GROUP=2"
- - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=3 GROUP=3"
- - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=1"
- - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=2"
- - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=3"
- - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=4"
- - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=5"
- - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=6"
- - "TEST_SUITE=plugins:spec DB=mysql GROUP_SIZE=3 GROUP=1"
- - "TEST_SUITE=plugins:spec DB=mysql GROUP_SIZE=3 GROUP=2"
- - "TEST_SUITE=plugins:spec DB=mysql GROUP_SIZE=3 GROUP=3"
- - "TEST_SUITE=plugins:cucumber DB=mysql GROUP_SIZE=3 GROUP=1"
- - "TEST_SUITE=plugins:cucumber DB=mysql GROUP_SIZE=3 GROUP=2"
- - "TEST_SUITE=plugins:cucumber DB=mysql GROUP_SIZE=3 GROUP=3"
-
-
- - "TEST_SUITE=spec_legacy DB=postgres GROUP_SIZE=2 GROUP=1"
- - "TEST_SUITE=spec_legacy DB=postgres GROUP_SIZE=2 GROUP=2"
- - "TEST_SUITE=cucumber DB=postgres GROUP_SIZE=3 GROUP=1"
- - "TEST_SUITE=cucumber DB=postgres GROUP_SIZE=3 GROUP=2"
- - "TEST_SUITE=cucumber DB=postgres GROUP_SIZE=3 GROUP=3"
- - "TEST_SUITE=rspec DB=postgres GROUP_SIZE=6 GROUP=1"
- - "TEST_SUITE=rspec DB=postgres GROUP_SIZE=6 GROUP=2"
- - "TEST_SUITE=rspec DB=postgres GROUP_SIZE=6 GROUP=3"
- - "TEST_SUITE=rspec DB=postgres GROUP_SIZE=6 GROUP=4"
- - "TEST_SUITE=rspec DB=postgres GROUP_SIZE=6 GROUP=5"
- - "TEST_SUITE=rspec DB=postgres GROUP_SIZE=6 GROUP=6"
- - "TEST_SUITE=plugins:spec DB=postgres GROUP_SIZE=3 GROUP=1"
- - "TEST_SUITE=plugins:spec DB=postgres GROUP_SIZE=3 GROUP=2"
- - "TEST_SUITE=plugins:spec DB=postgres GROUP_SIZE=3 GROUP=3"
- - "TEST_SUITE=plugins:cucumber DB=postgres GROUP_SIZE=3 GROUP=1"
- - "TEST_SUITE=plugins:cucumber DB=postgres GROUP_SIZE=3 GROUP=2"
- - "TEST_SUITE=plugins:cucumber DB=postgres GROUP_SIZE=3 GROUP=3"
+ - "TEST_SUITE=spec_legacy DB=mysql"
+ - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=1 GROUP=1"
+ - "TEST_SUITE=specs DB=mysql GROUP_SIZE=2 GROUP=1"
+ - "TEST_SUITE=specs DB=mysql GROUP_SIZE=2 GROUP=2"
+ - "TEST_SUITE=features DB=mysql GROUP_SIZE=3 GROUP=1"
+ - "TEST_SUITE=features DB=mysql GROUP_SIZE=3 GROUP=2"
+ - "TEST_SUITE=features DB=mysql GROUP_SIZE=3 GROUP=3"
+
+ - "TEST_SUITE=plugins:spec DB=mysql GROUP_SIZE=2 GROUP=1"
+ - "TEST_SUITE=plugins:spec DB=mysql GROUP_SIZE=2 GROUP=2"
+ - "TEST_SUITE=plugins:cucumber DB=mysql GROUP_SIZE=2 GROUP=1"
+ - "TEST_SUITE=plugins:cucumber DB=mysql GROUP_SIZE=2 GROUP=2"
+
+ - "TEST_SUITE=spec_legacy DB=postgres"
+ - "TEST_SUITE=cucumber DB=postgres GROUP_SIZE=1 GROUP=1"
+ - "TEST_SUITE=specs DB=postgres GROUP_SIZE=2 GROUP=1"
+ - "TEST_SUITE=specs DB=postgres GROUP_SIZE=2 GROUP=2"
+ - "TEST_SUITE=features DB=postgres GROUP_SIZE=3 GROUP=1"
+ - "TEST_SUITE=features DB=postgres GROUP_SIZE=3 GROUP=2"
+ - "TEST_SUITE=features DB=postgres GROUP_SIZE=3 GROUP=3"
+
+ - "TEST_SUITE=plugins:spec DB=postgres GROUP_SIZE=2 GROUP=1"
+ - "TEST_SUITE=plugins:spec DB=postgres GROUP_SIZE=2 GROUP=2"
+ - "TEST_SUITE=plugins:cucumber DB=postgres GROUP_SIZE=2 GROUP=1"
+ - "TEST_SUITE=plugins:cucumber DB=postgres GROUP_SIZE=2 GROUP=2"
before_install:
- "rvm @default,@global do gem uninstall bundler -a -x"
@@ -101,7 +90,11 @@ before_install:
- "export DISPLAY=:99.0"
- "/sbin/start-stop-daemon --start -v --pidfile ./tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1920x1080x16"
- "echo `xdpyinfo -display :99 | grep 'dimensions' | awk '{ print $2 }'`"
- - nvm install v0.12.9
+ # Install Node LTS Boron (6.9.1)
+ - nvm install 6.9.1
+ # We need npm 4.0 for a bugfix in cross-platform shrinkwrap
+ # https://github.com/npm/npm/issues/14042
+ - npm install npm@4.0
- travis_retry npm install
# We need phantomjs 2.0 to get tests passing
@@ -114,7 +107,7 @@ before_script:
- sh script/ci_setup.sh $DB
script:
- - sh script/ci_runner.sh $TEST_SUITE $GROUP_SIZE $GROUP
+ - sh script/ci_runner.sh
notifications:
email: false
View
@@ -0,0 +1,3 @@
+#Changelog
+
+Notable changes to the project are documented in the release notes at https://www.openproject.org/open-source/release-notes/.
View
@@ -1,7 +1,7 @@
-FROM ruby:2.1
+FROM ruby:2.2
ENV NODE_VERSION="6.9.1"
-ENV BUNDLER_VERSION="1.13.2"
+ENV BUNDLER_VERSION="1.11.2"
# install node + npm
RUN curl https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz | tar xzf - -C /usr/local --strip-components=1
@@ -35,6 +35,7 @@ COPY frontend/*.json /tmp/npm/frontend/
RUN chown -R app:app /tmp/npm
USER app
+RUN cd /tmp/npm && npm install npm@4.0
RUN cd /tmp/npm && RAILS_ENV=production npm install
RUN mv /tmp/npm/frontend /usr/src/app/
Oops, something went wrong.

0 comments on commit f1ee5ba

Please sign in to comment.