Permalink
Browse files

Merge tag 'v5.0.16' into stable/5

  • Loading branch information...
2 parents 697964e + 36b4b77 commit 38c3fbb4c243f6f08aefda44a1ae6f2dcf6d63ac @oliverguenther oliverguenther committed Mar 8, 2016
Showing with 2,155 additions and 882 deletions.
  1. +8 −5 Gemfile
  2. +72 −64 Gemfile.lock
  3. BIN app/assets/fonts/openproject_icon/openproject-icon-font.eot
  4. +3 −0 app/assets/fonts/openproject_icon/openproject-icon-font.svg
  5. BIN app/assets/fonts/openproject_icon/openproject-icon-font.ttf
  6. BIN app/assets/fonts/openproject_icon/openproject-icon-font.woff
  7. +13 −0 app/assets/stylesheets/content/_in_place_editing.sass
  8. +4 −0 app/assets/stylesheets/content/_wiki.sass
  9. +9 −0 app/assets/stylesheets/fonts/_openproject_icon_definitions.scss
  10. +5 −2 app/assets/stylesheets/fonts/_openproject_icon_font.lsg
  11. +5 −4 app/controllers/account_controller.rb
  12. +3 −0 app/controllers/api/v2/api_controller.rb
  13. +1 −1 app/controllers/application_controller.rb
  14. +8 −22 app/controllers/concerns/omniauth_login.rb
  15. +1 −0 app/controllers/messages_controller.rb
  16. +3 −3 app/controllers/repositories_controller.rb
  17. +48 −0 app/helpers/omniauth_helper.rb
  18. +15 −6 app/helpers/work_packages_helper.rb
  19. +10 −7 app/models/project.rb
  20. +5 −8 app/models/query.rb
  21. +10 −8 app/models/query/results.rb
  22. +8 −2 app/models/repository.rb
  23. +12 −3 app/models/time_entry.rb
  24. +34 −21 app/models/work_package.rb
  25. +104 −0 app/models/work_package/pdf_export/ifpdf.rb
  26. +82 −0 app/models/work_package/pdf_export/itcpdf.rb
  27. +41 −0 app/models/work_package/pdf_export/to_pdf_helper.rb
  28. +266 −0 app/models/work_package/pdf_export/work_package_list_to_pdf.rb
  29. +166 −0 app/models/work_package/pdf_export/work_package_to_pdf.rb
  30. +10 −409 app/models/work_package/pdf_exporter.rb
  31. +161 −0 app/models/work_package/spent_time.rb
  32. +6 −6 app/seeders/basic_data/type_seeder.rb
  33. +1 −1 app/services/create_work_package_service.rb
  34. +7 −4 app/services/scm/checkout_instructions_service.rb
  35. +1 −1 app/views/enumerations/destroy.html.erb
  36. +1 −1 app/views/messages/_form.html.erb
  37. +1 −1 app/views/repositories/_repository_header.html.erb
  38. +1 −1 app/views/user_mailer/message_posted.html.erb
  39. +13 −0 config/application.rb
  40. +8 −1 config/configuration.yml.example
  41. +55 −0 config/initializers/eager_load_with_hours.rb
  42. +2 −2 config/initializers/menus.rb
  43. +2 −2 config/settings.yml
  44. +0 −9 config/unicorn.rb
  45. +2 −0 doc/apiv2-documentation.md
  46. +6 −0 doc/apiv3-documentation.apib
  47. +8 −5 doc/operation_guides/manual/installation-guide.md
  48. +6 −0 doc/operation_guides/manual/upgrade-guide.md
  49. +52 −14 doc/operation_guides/packager/installation-guide.md
  50. +4 −0 frontend/app/components/inplace-edit/services/inplace-edit-multi-storage.service.js
  51. +1 −1 frontend/app/components/routing/routing.configuration.ts
  52. +2 −0 lib/api/decorators/single.rb
  53. +34 −22 lib/api/v3/utilities/custom_field_injector.rb
  54. +7 −0 lib/api/v3/utilities/path_helper.rb
  55. +35 −0 lib/api/v3/work_packages/work_package_collection_representer.rb
  56. +5 −1 lib/api/v3/work_packages/work_package_list_helpers.rb
  57. +30 −4 lib/api/v3/work_packages/work_package_representer.rb
  58. +8 −1 lib/open_project/configuration.rb
  59. +0 −17 lib/open_project/configuration/helpers.rb
  60. +1 −1 lib/open_project/object_linking.rb
  61. +3 −0 lib/open_project/omni_auth/authorization.rb
  62. +8 −2 lib/open_project/scm/adapters/subversion.rb
  63. +3 −3 lib/open_project/text_formatting.rb
  64. +1 −1 lib/open_project/version.rb
  65. +6 −0 lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb
  66. +4 −1 lib/redmine/menu_manager/menu_helper.rb
  67. +21 −25 lib/redmine/menu_manager/top_menu_helper.rb
  68. +2 −2 lib/redmine/wiki_formatting.rb
  69. +4 −2 lib/tasks/packager.rake
  70. +2 −4 spec/controllers/account_controller_spec.rb
  71. +59 −2 spec/controllers/repositories_controller_spec.rb
  72. +25 −29 spec/features/auth/omniauth_spec.rb
  73. +4 −0 spec/lib/api/v3/utilities/path_helper_spec.rb
  74. +1 −1 spec/lib/api/v3/work_packages/work_package_representer_spec.rb
  75. +2 −2 spec/lib/open_project/text_formatting_spec.rb
  76. +10 −0 spec/models/repository/git_spec.rb
  77. +10 −0 spec/models/repository/subversion_spec.rb
  78. +169 −0 spec/models/work_package/spent_time_spec.rb
  79. +0 −83 spec/models/work_package_spec.rb
  80. +54 −0 spec/requests/api/v3/rack_deflater_spec.rb
  81. +4 −0 spec/requests/api/v3/work_package_resource_spec.rb
  82. +43 −2 spec/requests/auth/api_v2_spec.rb
  83. +8 −4 spec/services/scm/checkout_instructions_service_spec.rb
  84. +42 −0 spec/support/shared/with_config.rb
  85. +40 −0 spec/support/shared/with_settings.rb
  86. +3 −2 spec/views/layouts/base.html.erb_spec.rb
  87. +1 −1 vendored-plugins/openproject-announcements/lib/open_project/announcements/version.rb
  88. +2 −2 vendored-plugins/openproject-auth_plugins/lib/omniauth/flexible_strategy.rb
  89. +1 −1 vendored-plugins/openproject-auth_plugins/lib/open_project/auth_plugins/version.rb
  90. +6 −6 vendored-plugins/openproject-backlogs/app/views/rb_taskboards/show.html.erb
  91. +47 −0 vendored-plugins/openproject-backlogs/lib/open_project/backlogs/patches/setting_seeder_patch.rb
  92. +1 −1 vendored-plugins/openproject-backlogs/lib/open_project/backlogs/version.rb
  93. +0 −4 vendored-plugins/openproject-costs/app/assets/stylesheets/costs/costs_legacy.css
  94. +15 −7 vendored-plugins/openproject-costs/app/views/cost_objects/_form.html.erb
  95. +14 −2 vendored-plugins/openproject-costs/lib/open_project/costs/attributes_helper.rb
  96. +9 −1 vendored-plugins/openproject-costs/lib/open_project/costs/engine.rb
  97. +15 −11 vendored-plugins/openproject-costs/lib/open_project/costs/patches/time_entry_patch.rb
  98. +1 −1 vendored-plugins/openproject-costs/lib/open_project/costs/version.rb
  99. +20 −0 vendored-plugins/openproject-costs/spec/lib/api/v3/work_packages/work_package_representer_spec.rb
  100. +48 −0 vendored-plugins/openproject-costs/spec/models/time_entry_spec.rb
  101. +4 −0 vendored-plugins/openproject-documents/app/assets/stylesheets/documents/documents.css.erb
  102. +3 −1 vendored-plugins/openproject-documents/app/views/documents/index.html.erb
  103. +1 −1 vendored-plugins/openproject-documents/lib/open_project/documents/version.rb
  104. +1 −1 vendored-plugins/openproject-github_integration/lib/open_project/github_integration/version.rb
  105. +1 −1 vendored-plugins/openproject-global_roles/lib/open_project/global_roles/version.rb
  106. +1 −1 vendored-plugins/openproject-help_link/lib/open_project/help_link/version.rb
  107. +1 −1 vendored-plugins/openproject-local_avatars/lib/open_project/local_avatars/version.rb
  108. +16 −0 vendored-plugins/openproject-meeting/app/assets/stylesheets/meeting/meeting.css.erb
  109. +2 −3 vendored-plugins/openproject-meeting/app/views/meetings/index.html.erb
  110. +1 −1 vendored-plugins/openproject-meeting/app/views/meetings/show.html.erb
  111. +1 −1 vendored-plugins/openproject-meeting/lib/open_project/meeting/version.rb
  112. +1 −1 vendored-plugins/openproject-my_project_page/lib/open_project/my_project_page/version.rb
  113. +1 −1 vendored-plugins/openproject-openid_connect/lib/open_project/openid_connect/version.rb
  114. +1 −1 vendored-plugins/openproject-pdf_export/lib/open_project/pdf_export/version.rb
  115. +1 −1 vendored-plugins/openproject-reporting/lib/open_project/reporting/version.rb
  116. +1 −1 vendored-plugins/openproject-themes-dark/lib/open_project/themes/dark/version.rb
  117. +1 −1 vendored-plugins/openproject-webhooks/lib/open_project/webhooks/version.rb
  118. +1 −1 vendored-plugins/openproject-xls_export/lib/open_project/xls_export/version.rb
  119. +1 −1 vendored-plugins/reporting_engine/lib/report/controller.rb
  120. +1 −1 vendored-plugins/reporting_engine/lib/reporting_engine/version.rb
View
@@ -30,6 +30,7 @@ source 'https://rubygems.org'
gem 'rails', '~> 4.2.5'
gem 'actionpack-action_caching'
+gem 'actionpack-xml_parser'
gem 'activerecord-session_store'
gem 'rails-observers'
gem 'responders', '~> 2.0'
@@ -38,7 +39,7 @@ gem 'coderay', '~> 1.1.0'
gem 'rubytree', '~> 0.8.3'
gem 'rdoc', '>= 2.4.2'
gem 'globalize', '~> 5.0.1'
-gem 'omniauth'
+gem 'omniauth', github: 'oliverguenther/omniauth'
gem 'request_store', '~> 1.1.0'
gem 'gravatar_image_tag', '~> 1.2.0'
@@ -106,8 +107,8 @@ gem 'transactional_lock', git: 'https://github.com/finnlabs/transactional_lock.g
group :production do
# we use dalli as standard memcache client
# requires memcached 1.4+
- # see https://github.com/mperham/dalli
- gem 'dalli', '~> 2.7.2'
+ # see https://github.clientom/mperham/dalli
+ gem 'dalli', '~> 2.7.6'
end
gem 'sprockets', '~> 2.12.3'
@@ -246,8 +247,10 @@ group :docker do
gem 'newrelic_rpm', require: !!ENV['HEROKU']
end
-# Load Gemfile.local, Gemfile.plugins and plugins' Gemfiles
-Dir.glob File.expand_path('../{Gemfile.local,Gemfile.plugins,lib/plugins/*/Gemfile}', __FILE__) do |file|
+# Load Gemfile.local, Gemfile.plugins, plugins', and custom Gemfiles
+gemfiles = Dir.glob File.expand_path('../{Gemfile.local,Gemfile.plugins,lib/plugins/*/Gemfile}', __FILE__)
+gemfiles << ENV['CUSTOM_PLUGIN_GEMFILE'] unless ENV['CUSTOM_PLUGIN_GEMFILE'].nil?
+gemfiles.each do |file|
next unless File.readable?(file)
eval_gemfile(file)
end
Oops, something went wrong.

0 comments on commit 38c3fbb

Please sign in to comment.