Permalink
Browse files

Release openproject-ce v5.0.8

  • Loading branch information...
2 parents a33b195 + 79aa23d commit 7d2f56c6fb232fc2aec489dd7d30ecfc167f6bfa @oliverguenther oliverguenther committed Jan 8, 2016
Showing with 9,256 additions and 811 deletions.
  1. +7 −0 .dockerignore
  2. +1 −1 .travis.yml
  3. +50 −0 Dockerfile
  4. +15 −2 Gemfile
  5. +78 −61 Gemfile.lock
  6. +1 −1 Gemfile.plugins
  7. BIN app/assets/fonts/openproject_icon/openproject-icon-font.eot
  8. +3 −1 app/assets/fonts/openproject_icon/openproject-icon-font.svg
  9. BIN app/assets/fonts/openproject_icon/openproject-icon-font.ttf
  10. BIN app/assets/fonts/openproject_icon/openproject-icon-font.woff
  11. +1 −1 app/assets/javascripts/flash_messages.js
  12. +0 −3 app/assets/stylesheets/_misc_legacy.sass
  13. +1 −1 app/assets/stylesheets/_settings.scss
  14. +75 −0 app/assets/stylesheets/content/_accounts_mobile.sass
  15. +0 −8 app/assets/stylesheets/content/_buttons.sass
  16. +8 −0 app/assets/stylesheets/content/_forms.sass
  17. +55 −0 app/assets/stylesheets/content/_forms_mobile.sass
  18. +2 −1 app/assets/stylesheets/content/_my_page.sass
  19. +9 −8 ...pp/ui_components/toolbar-directive.js → app/assets/stylesheets/content/_notifications_mobile.sass
  20. +2 −2 app/assets/stylesheets/content/_table.lsg
  21. +5 −0 app/assets/stylesheets/content/_widget_box.sass
  22. +7 −0 app/assets/stylesheets/content/_work_packages.sass
  23. +3 −0 app/assets/stylesheets/default.css.sass
  24. +6 −1 app/assets/stylesheets/fonts/_openproject_icon_definitions.scss
  25. +2 −0 app/assets/stylesheets/fonts/_openproject_icon_font.lsg
  26. +4 −0 app/assets/stylesheets/layout/_all.sass
  27. +70 −0 app/assets/stylesheets/layout/_base_mobile.sass
  28. +41 −0 app/assets/stylesheets/layout/_drop_down_mobile.sass
  29. +1 −1 app/assets/stylesheets/layout/_main_menu.sass
  30. +87 −0 app/assets/stylesheets/layout/_top_menu_mobile.sass
  31. +1 −1 app/assets/stylesheets/layout/_work_package.sass
  32. +195 −0 app/assets/stylesheets/layout/_work_package_mobile.sass
  33. +10 −0 app/assets/stylesheets/specific/homescreen.sass
  34. +11 −7 app/controllers/wiki_controller.rb
  35. +1 −1 app/controllers/wiki_menu_items_controller.rb
  36. +61 −25 app/controllers/work_packages/auto_completes_controller.rb
  37. +1 −2 app/helpers/toolbar_helper.rb
  38. +1 −1 app/helpers/watchers_helper.rb
  39. +13 −10 app/models/permitted_params.rb
  40. +5 −3 app/seeders/basic_data/setting_seeder.rb
  41. +1 −1 app/views/admin/plugins.html.erb
  42. +1 −1 app/views/admin/projects.html.erb
  43. +0 −2 app/views/api/experimental/projects/show.api.rabl
  44. +1 −1 app/views/auth_sources/index.html.erb
  45. +1 −1 app/views/boards/index.html.erb
  46. +1 −1 app/views/boards/show.html.erb
  47. +1 −1 app/views/custom_fields/_tab.html.erb
  48. +1 −1 app/views/enumerations/index.html.erb
  49. +1 −1 app/views/groups/_memberships.html.erb
  50. +1 −1 app/views/groups/_users.html.erb
  51. +1 −1 app/views/groups/index.html.erb
  52. +1 −1 app/views/homescreen/blocks/_community.html.erb
  53. +1 −0 app/views/layouts/angular.html.erb
  54. +1 −0 app/views/layouts/base.html.erb
  55. +1 −1 app/views/members/index.html.erb
  56. +1 −1 app/views/my/access_token.html.erb
  57. +1 −1 app/views/my/blocks/_timelog.html.erb
  58. +2 −2 app/views/my/page.html.erb
  59. +3 −3 app/views/my/page_layout.html.erb
  60. +1 −1 app/views/planning_element_type_colors/index.html.erb
  61. +1 −1 app/views/project_associations/index.html.erb
  62. +1 −1 app/views/project_types/index.html.erb
  63. +1 −1 app/views/projects/form/_activities.html.erb
  64. +1 −1 app/views/projects/form/_types.html.erb
  65. +1 −1 app/views/projects/settings/_boards.html.erb
  66. +1 −1 app/views/projects/settings/_categories.html.erb
  67. +1 −1 app/views/projects/settings/_versions.html.erb
  68. +1 −1 app/views/reportings/index.html.erb
  69. +1 −1 app/views/repositories/_dir_list.html.erb
  70. +1 −1 app/views/repositories/_revisions.html.erb
  71. +1 −1 app/views/repositories/committers.html.erb
  72. +1 −1 app/views/roles/index.html.erb
  73. +1 −1 app/views/roles/report.html.erb
  74. +1 −1 app/views/search/_mini_form.html.erb
  75. +1 −1 app/views/statuses/index.html.erb
  76. +1 −1 app/views/time_entries/reports/show.html.erb
  77. +1 −1 app/views/timelog/_list.html.erb
  78. +5 −1 app/views/types/_form.html.erb
  79. +1 −1 app/views/types/index.html.erb
  80. +1 −1 app/views/users/_memberships.html.erb
  81. +1 −1 app/views/users/index.html.erb
  82. +1 −1 app/views/wiki/history.html.erb
  83. +1 −1 app/views/work_packages/_list_simple.html.erb
  84. +1 −1 app/views/work_packages/reports/_report.html.erb
  85. +1 −1 app/views/workflows/_form.html.erb
  86. +1 −1 app/views/workflows/index.html.erb
  87. +2 −0 config/initializers/menus.rb
  88. +8 −1 config/locales/js-en.yml
  89. +1 −1 doc/operation_guides/manual/installation-guide.md
  90. +3 −0 docker/Procfile
  91. +26 −0 docker/cron
  92. +211 −0 docker/nginx.conf.erb
  93. +23 −0 docker/web
  94. +2 −0 docker/worker
  95. +1 −1 ...p/components/inplace-edit/directives/field-display/display-version/display-version.directive.html
  96. +4 −3 ...app/components/inplace-edit/directives/field-display/display-version/display-version.directive.js
  97. +6 −0 .../app/components/inplace-edit/directives/field-edit/edit-date-range/edit-date-range.directive.html
  98. +117 −73 ...nd/app/components/inplace-edit/directives/field-edit/edit-date-range/edit-date-range.directive.js
  99. +2 −0 frontend/app/components/inplace-edit/directives/field-edit/edit-date/edit-date.directive.html
  100. +47 −32 frontend/app/components/inplace-edit/directives/field-edit/edit-date/edit-date.directive.js
  101. +1 −1 ...nd/app/components/inplace-edit/directives/field-edit/edit-drop-down/edit-drop-down.directive.html
  102. +1 −1 ...tend/app/components/inplace-edit/directives/field-edit/edit-drop-down/edit-drop-down.directive.js
  103. +1 −2 .../components/inplace-edit/directives/field-edit/edit-wiki-textarea/edit-wiki-textarea.directive.js
  104. +83 −0 frontend/app/components/responsive/responsive-view.service.test.ts
  105. +46 −0 frontend/app/components/responsive/responsive-view.service.ts
  106. 0 frontend/app/components/{routes → routing}/controllers/work-package-details.controller.js
  107. 0 frontend/app/components/{routes → routing}/controllers/work-package-details.controller.test.js
  108. +6 −11 frontend/app/components/{routes → routing}/controllers/work-package-show.controller.js
  109. +0 −6 frontend/app/components/{routes → routing}/controllers/work-packages-list.controller.js
  110. 0 frontend/app/components/{routes → routing}/controllers/work-packages-list.controller.test.js
  111. +12 −11 ...rollers/work-packages-controller.js → components/routing/controllers/work-packages.controller.js}
  112. +9 −11 ...ackages-controller-test.js → app/components/routing/controllers/work-packages.controller.test.js}
  113. +26 −15 .../unit/tests/work_packages/routing-test.js → app/components/routing/routing.configuration.test.ts}
  114. +274 −0 frontend/app/components/routing/routing.configuration.ts
  115. +0 −2 frontend/app/{templates/work_packages.html → components/routing/views/work-packages.html}
  116. 0 frontend/app/components/{routes/partials → routing/views}/work-packages.list.details.html
  117. +6 −20 frontend/app/components/{routes/partials → routing/views}/work-packages.list.html
  118. 0 frontend/app/components/{routes/partials → routing/views}/work-packages.list.new.html
  119. 0 frontend/app/components/{routes/partials → routing/views}/work-packages.new.html
  120. +7 −20 frontend/app/components/{routes/partials → routing/views}/work-packages.show.html
  121. +7 −2 frontend/app/components/work-packages/controllers/wp-new.controller.js
  122. +1 −1 frontend/app/components/work-packages/directives/wp-create-form/wp-create-form.directive.html
  123. +1 −1 frontend/app/components/work-packages/directives/wp-create-form/wp-full-create-form.directive.html
  124. +12 −14 ...ective-test.js → app/components/work-packages/directives/wp-toolbar/wp-toolbar.directive.test.ts}
  125. +41 −0 frontend/app/components/work-packages/directives/wp-toolbar/wp-toolbar.directive.ts
  126. +15 −0 frontend/app/components/wp-buttons/wp-list-view-button/wp-list-view-button.directive.html
  127. +80 −0 frontend/app/components/wp-buttons/wp-list-view-button/wp-list-view-button.directive.js
  128. +126 −0 frontend/app/components/wp-buttons/wp-list-view-button/wp-list-view-button.directive.test.js
  129. +4 −1 frontend/app/components/wp-table/directives/wp-column/wp-column.directive.js
  130. +12 −3 frontend/app/helpers/auto-complete-helper.js
  131. +6 −3 frontend/app/openproject-app.js
  132. +0 −265 frontend/app/routing.js
  133. +5 −2 frontend/app/templates/components/selectable_title.html
  134. +1 −1 frontend/app/templates/work_packages/attachments-edit.html
  135. +1 −1 frontend/app/templates/work_packages/attachments.html
  136. +1 −0 frontend/app/templates/work_packages/menus/query_select_dropdown_menu.html
  137. +29 −21 frontend/app/templates/work_packages/modals/group_by.html
  138. +13 −13 frontend/app/templates/work_packages/modals/sorting.html
  139. +1 −1 frontend/app/templates/work_packages/tabs/overview.html
  140. +1 −2 frontend/app/ui_components/has-preview-directive.js
  141. +0 −1 frontend/app/ui_components/index.js
  142. +4 −1 frontend/app/ui_components/selectable-title-directive.js
  143. +6 −1 frontend/app/work_packages/controllers/details-tab-overview-controller.js
  144. +20 −8 frontend/app/work_packages/controllers/dialogs/sorting.js
  145. +0 −10 frontend/app/work_packages/controllers/index.js
  146. +12 −1 frontend/app/work_packages/helpers/work-package-display-helper.js
  147. +17 −1 frontend/app/work_packages/models/datepicker.js
  148. +19 −2 frontend/karma.conf.js
  149. +45 −0 frontend/npm-shrinkwrap.json
  150. +3 −0 frontend/package.json
  151. +46 −1 frontend/tests/integration/specs/work-packages/details-pane/date-range-picker-spec.js
  152. +2 −2 frontend/tests/integration/specs/work-packages/work-packages-modal-focus-spec.js
  153. +10 −5 frontend/tests/unit/tests/ui_components/selectable-title-directive-test.js
  154. +2 −6 frontend/tests/unit/tests/work_packages/controllers/dialogs/sorting-modal-test.js
  155. +12 −0 frontend/tsconfig.json
  156. +33 −0 frontend/tsd.json
  157. +356 −0 frontend/typings/angular-ui-router/angular-ui-router.d.ts
  158. +318 −0 frontend/typings/angularjs/angular-mocks.d.ts
  159. +1,772 −0 frontend/typings/angularjs/angular.d.ts
  160. +15 −0 frontend/typings/assertion-error/assertion-error.d.ts
  161. +388 −0 frontend/typings/chai/chai.d.ts
  162. +3,190 −0 frontend/typings/jquery/jquery.d.ts
  163. +236 −0 frontend/typings/mocha/mocha.d.ts
  164. +435 −0 frontend/typings/sinon/sinon.d.ts
  165. +8 −0 frontend/typings/tsd.d.ts
  166. +3 −0 frontend/webpack.config.js
  167. +1 −5 lib/open_project/scm/adapters/local_client.rb
  168. +2 −9 lib/open_project/scm/adapters/subversion.rb
  169. +1 −1 lib/open_project/version.rb
  170. +1 −1 lib/redmine/menu_manager/top_menu_helper.rb
  171. +1 −1 lib/tabular_form_builder.rb
  172. +111 −0 lib/tasks/packager.rake
  173. +6 −4 packaging/conf/configuration.yml
  174. +2 −3 spec/features/support/work_package_table.rb
  175. +1 −1 spec/features/work_packages/details/activity_comments_spec.rb
  176. +1 −2 spec/lib/open_project/scm/adapters/subversion_adapter_spec.rb
  177. +1 −1 spec/lib/tabular_form_builder_spec.rb
  178. +9 −2 spec/models/permitted_params_spec.rb
  179. +0 −2 spec/views/api/experimental/projects/index_api_json_spec.rb
  180. +0 −8 spec/views/api/experimental/projects/show_api_json_spec.rb
View
@@ -0,0 +1,7 @@
+.git
+.bundle
+.env*
+tmp
+frontend/node_modules
+# travis
+vendor/bundle
View
@@ -39,7 +39,7 @@ cache:
- frontend/node_modules
- frontend/bower_components
-bundler_args: --without development production
+bundler_args: --without development production docker
branches:
only:
View
@@ -0,0 +1,50 @@
+FROM ruby:2.1
+
+ENV NODE_VERSION="0.12.7"
+ENV BUNDLER_VERSION="1.10.6"
+
+# 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
+
+# Using /home/app since npm cache and other stuff will be put there when running npm install
+# We don't want to pollute any locally-mounted directory
+RUN useradd -d /home/app -m app
+RUN mkdir -p /usr/src/app
+RUN chown -R app /usr/src/app /usr/local/bundle
+RUN gem install bundler --version "${BUNDLER_VERSION}"
+
+WORKDIR /usr/src/app
+
+# https registry breaks so often it's no longer funny
+RUN echo "registry = 'http://registry.npmjs.org/'" >> /usr/local/etc/npmrc
+# moar logs
+RUN echo "loglevel=info" >> /usr/local/etc/npmrc
+
+COPY Gemfile ./Gemfile
+COPY Gemfile.* ./
+RUN chown -R app:app /usr/src/app
+
+USER app
+RUN bundle install --jobs 8 --retry 3
+
+USER root
+# Then, npm install node modules
+COPY package.json /tmp/npm/package.json
+COPY frontend/*.json /tmp/npm/frontend/
+RUN chown -R app:app /tmp/npm
+
+USER app
+RUN cd /tmp/npm && RAILS_ENV=production npm install
+RUN mv /tmp/npm/frontend /usr/src/app/
+
+# Finally, copy over the whole thing
+USER root
+COPY . /usr/src/app
+RUN cp docker/Procfile .
+RUN sed -i "s|Rails.groups(:opf_plugins)|Rails.groups(:opf_plugins, :docker)|" config/application.rb
+RUN chown -R app:app /usr/src/app
+
+USER app
+RUN DATABASE_URL=sqlite3:///tmp/db.sqlite3 SECRET_TOKEN=foobar RAILS_ENV=production bundle exec rake assets:precompile
+
+CMD ["./docker/web"]
View
@@ -130,7 +130,7 @@ gem 'cocaine'
# also, better than thin since we can control worker concurrency.
gem 'unicorn'
-gem 'nokogiri', '~> 1.6.6'
+gem 'nokogiri', '~> 1.6.7'
gem 'carrierwave', '~> 0.10.0'
gem 'fog', '~> 1.23.0', require: 'fog/aws/storage'
@@ -230,7 +230,20 @@ platforms :jruby do
end
group :opf_plugins do
- gem 'openproject-translations', git:'https://github.com/opf/openproject-translations.git', tag: 'v5.0.7'
+ gem 'openproject-translations', git:'https://github.com/opf/openproject-translations.git', tag: 'v5.0.8'
+end
+
+# TODO: Make this group :optional when bundler v10.x
+# is matured enough that we can use this everywhere
+# http://bundler.io/blog/2015/06/24/version-1-10-released.html
+group :docker do
+ gem 'passenger'
+
+ # Used to easily precompile assets
+ gem 'sqlite3', require: false
+ gem 'rails_12factor', require: !!ENV['HEROKU']
+ gem 'health_check', require: !!ENV['HEROKU']
+ gem 'newrelic_rpm', require: !!ENV['HEROKU']
end
# Load Gemfile.local, Gemfile.plugins and plugins' Gemfiles
Oops, something went wrong.

0 comments on commit 7d2f56c

Please sign in to comment.