diff --git a/.travis.yml b/.travis.yml index 889302151f..c1c92339e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,17 +33,18 @@ language: ruby rvm: - - 2.2.3 + - 2.2.5 sudo: false cache: - - bundler: true - - directories: + bundler: true + directories: - frontend/node_modules - frontend/bower_components -bundler_args: --without development production + +bundler_args: --without development production docker branches: only: @@ -63,17 +64,15 @@ env: - "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=spec_legacy DB=mysql" + - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=2 GROUP=1" + - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=2 GROUP=2" + - "TEST_SUITE=specs DB=mysql GROUP_SIZE=3 GROUP=1" + - "TEST_SUITE=specs DB=mysql GROUP_SIZE=3 GROUP=2" + - "TEST_SUITE=specs DB=mysql GROUP_SIZE=3 GROUP=3" + - "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" before_install: # Custom plugin instructions follow. @@ -98,6 +97,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 }'`" + # 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 @@ -110,7 +114,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 addons: firefox: "45.0esr" diff --git a/app/assets/stylesheets/documents/documents.css.erb b/app/assets/stylesheets/documents/documents.css.erb deleted file mode 100644 index c27f4bf2ff..0000000000 --- a/app/assets/stylesheets/documents/documents.css.erb +++ /dev/null @@ -1,55 +0,0 @@ -/*-- copyright -OpenProject Documents Plugin - -Former OpenProject Core functionality extracted into a plugin. - -Copyright (C) 2009-2014 the OpenProject Foundation (OPF) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 3. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2013 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -See doc/COPYRIGHT.rdoc for more details. - -++*/ - -dt.document:before { - content: "\e006"; -} - -.sidebar--document-sort label:last-of-type { - margin-bottom: 2rem; -} - -.document-category-elements { - display: inline; -} - -.document-category-elements--header { - margin-bottom: 0.25rem; -} - -.document-category-elements--date { - margin-bottom: 0.75rem; -} - -.document-category-elements .wiki { - margin-bottom: 2rem; -} diff --git a/app/assets/stylesheets/documents/documents.sass b/app/assets/stylesheets/documents/documents.sass new file mode 100644 index 0000000000..60571b98b8 --- /dev/null +++ b/app/assets/stylesheets/documents/documents.sass @@ -0,0 +1,51 @@ +/*-- copyright + * OpenProject Documents Plugin + * + * Former OpenProject Core functionality extracted into a plugin. + * + * Copyright (C) 2009-2014 the OpenProject Foundation (OPF) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 3. + * + * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: + * Copyright (C) 2006-2013 Jean-Philippe Lang + * Copyright (C) 2010-2013 the ChiliProject Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * See doc/COPYRIGHT.rdoc for more details. + */ + +dt.document:before + content: "\e006" + +.sidebar--document-sort label:last-of-type + margin-bottom: 2rem + +.document-category--inner-section + padding-top: 20px + +.document-category-elements + display: inline + +.document-category-elements--header + margin-bottom: 0.25rem + +.document-category-elements--date + margin-bottom: 0.75rem + +.document-category-elements .wiki + margin-bottom: 2rem diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb index ef6e711f46..ebc08a361b 100644 --- a/app/views/documents/index.html.erb +++ b/app/views/documents/index.html.erb @@ -51,12 +51,14 @@ See doc/COPYRIGHT.rdoc for more details. <% end %> <% @grouped.keys.sort.each do |group| %> -