Permalink
Browse files

Merge tag 'v5.0.20' into stable/5

  • Loading branch information...
2 parents c96bb31 + 59227df commit 25edf70d3b45e7da7b3de44a69244d0346c04dcc @oliverguenther oliverguenther committed Aug 16, 2016
Showing with 84 additions and 84 deletions.
  1. +1 −1 Gemfile
  2. +54 −54 Gemfile.lock
  3. +3 −3 config/locales/en.yml
  4. +4 −4 config/locales/js-en.yml
  5. +1 −1 lib/open_project/version.rb
  6. +1 −1 spec_legacy/functional/repositories_controller_spec.rb
  7. +1 −1 vendored-plugins/openproject-announcements/lib/open_project/announcements/version.rb
  8. +1 −1 vendored-plugins/openproject-auth_plugins/lib/open_project/auth_plugins/version.rb
  9. +1 −1 vendored-plugins/openproject-backlogs/lib/open_project/backlogs/version.rb
  10. +1 −1 vendored-plugins/openproject-costs/lib/open_project/costs/version.rb
  11. +1 −1 vendored-plugins/openproject-documents/lib/open_project/documents/version.rb
  12. +1 −1 vendored-plugins/openproject-github_integration/lib/open_project/github_integration/version.rb
  13. +1 −1 vendored-plugins/openproject-global_roles/lib/open_project/global_roles/version.rb
  14. +1 −1 vendored-plugins/openproject-help_link/lib/open_project/help_link/version.rb
  15. +1 −1 vendored-plugins/openproject-local_avatars/lib/open_project/local_avatars/version.rb
  16. +2 −2 vendored-plugins/openproject-meeting/app/views/meetings/_form.html.erb
  17. +1 −1 vendored-plugins/openproject-meeting/lib/open_project/meeting/version.rb
  18. +1 −1 vendored-plugins/openproject-my_project_page/lib/open_project/my_project_page/version.rb
  19. +1 −1 vendored-plugins/openproject-openid_connect/lib/open_project/openid_connect/version.rb
  20. +1 −1 vendored-plugins/openproject-pdf_export/lib/open_project/pdf_export/version.rb
  21. +1 −1 vendored-plugins/openproject-reporting/lib/open_project/reporting/version.rb
  22. +1 −1 vendored-plugins/openproject-themes-dark/lib/open_project/themes/dark/version.rb
  23. +1 −1 vendored-plugins/openproject-webhooks/lib/open_project/webhooks/version.rb
  24. +1 −1 vendored-plugins/openproject-xls_export/lib/open_project/xls_export/version.rb
  25. +1 −1 vendored-plugins/reporting_engine/lib/reporting_engine/version.rb
View
@@ -28,7 +28,7 @@
source 'https://rubygems.org'
-gem 'rails', '~> 4.2.5'
+gem 'rails', '~> 4.2.7'
gem 'actionpack-action_caching'
gem 'actionpack-xml_parser'
gem 'activerecord-session_store'
View
@@ -94,10 +94,10 @@ GIT
GIT
remote: https://github.com/opf/openproject-translations.git
- revision: 31f5157005783b91d58c1cb4fb808e9934bfe06a
+ revision: c8ab7018e72917e9a4a6bae779064635ad646313
branch: stable/5
specs:
- openproject-translations (5.0.19)
+ openproject-translations (5.0.20)
crowdin-api (~> 0.4.0)
mixlib-shellout (~> 2.1.0)
rails (~> 4.2.3)
@@ -129,78 +129,78 @@ GIT
PATH
remote: vendored-plugins/openproject-announcements
specs:
- openproject-announcements (5.0.19)
+ openproject-announcements (5.0.20)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-auth_plugins
specs:
- openproject-auth_plugins (5.0.19)
+ openproject-auth_plugins (5.0.20)
omniauth (~> 1.0)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-backlogs
specs:
- openproject-backlogs (5.0.19)
+ openproject-backlogs (5.0.20)
acts_as_silent_list (~> 2.0.0)
openproject-pdf_export
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-costs
specs:
- openproject-costs (5.0.19)
+ openproject-costs (5.0.20)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-documents
specs:
- openproject-documents (5.0.19)
+ openproject-documents (5.0.20)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-github_integration
specs:
- openproject-github_integration (5.0.19)
+ openproject-github_integration (5.0.20)
openproject-webhooks (~> 5.0.1)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-global_roles
specs:
- openproject-global_roles (5.0.19)
+ openproject-global_roles (5.0.20)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-help_link
specs:
- openproject-help_link (5.0.19)
+ openproject-help_link (5.0.20)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-local_avatars
specs:
- openproject-local_avatars (5.0.19)
+ openproject-local_avatars (5.0.20)
rails (~> 4.2.4)
rmagick (~> 2.15.4)
PATH
remote: vendored-plugins/openproject-meeting
specs:
- openproject-meeting (5.0.19)
+ openproject-meeting (5.0.20)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-my_project_page
specs:
- openproject-my_project_page (5.0.19)
+ openproject-my_project_page (5.0.20)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-openid_connect
specs:
- openproject-openid_connect (5.0.19)
+ openproject-openid_connect (5.0.20)
lobby_boy (~> 0.1)
omniauth-openid_connect-providers (~> 0.1)
openproject-auth_plugins (~> 5.0.1)
@@ -209,57 +209,57 @@ PATH
PATH
remote: vendored-plugins/openproject-pdf_export
specs:
- openproject-pdf_export (5.0.19)
+ openproject-pdf_export (5.0.20)
prawn (~> 2.1.0)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-reporting
specs:
- openproject-reporting (5.0.19)
+ openproject-reporting (5.0.20)
openproject-costs (>= 5.0.1)
rails (~> 4.2.4)
reporting_engine (>= 1.1.0)
PATH
remote: vendored-plugins/openproject-themes-dark
specs:
- openproject-themes-dark (5.0.19)
+ openproject-themes-dark (5.0.20)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-webhooks
specs:
- openproject-webhooks (5.0.19)
+ openproject-webhooks (5.0.20)
rails (~> 4.2.4)
PATH
remote: vendored-plugins/openproject-xls_export
specs:
- openproject-xls_export (5.0.19)
+ openproject-xls_export (5.0.20)
rails (~> 4.2.4)
spreadsheet (~> 0.8.9)
PATH
remote: vendored-plugins/reporting_engine
specs:
- reporting_engine (5.0.19)
+ reporting_engine (5.0.20)
json
rails (~> 4.2.4)
GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.0.2)
- actionmailer (4.2.6)
- actionpack (= 4.2.6)
- actionview (= 4.2.6)
- activejob (= 4.2.6)
+ actionmailer (4.2.7.1)
+ actionpack (= 4.2.7.1)
+ actionview (= 4.2.7.1)
+ activejob (= 4.2.7.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.6)
- actionview (= 4.2.6)
- activesupport (= 4.2.6)
+ actionpack (4.2.7.1)
+ actionview (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
@@ -268,29 +268,29 @@ GEM
actionpack (>= 4.0.0, < 5.0)
actionpack-xml_parser (1.0.2)
actionpack (>= 4.0.0, < 5)
- actionview (4.2.6)
- activesupport (= 4.2.6)
+ actionview (4.2.7.1)
+ activesupport (= 4.2.7.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- activejob (4.2.6)
- activesupport (= 4.2.6)
+ activejob (4.2.7.1)
+ activesupport (= 4.2.7.1)
globalid (>= 0.3.0)
- activemodel (4.2.6)
- activesupport (= 4.2.6)
+ activemodel (4.2.7.1)
+ activesupport (= 4.2.7.1)
builder (~> 3.1)
- activerecord (4.2.6)
- activemodel (= 4.2.6)
- activesupport (= 4.2.6)
+ activerecord (4.2.7.1)
+ activemodel (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
arel (~> 6.0)
activerecord-session_store (0.1.1)
actionpack (>= 4.0.0, < 5)
activerecord (>= 4.0.0, < 5)
railties (>= 4.0.0, < 5)
activerecord-tableless (1.3.4)
activerecord (>= 2.3.0)
- activesupport (4.2.6)
+ activesupport (4.2.7.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@@ -358,8 +358,8 @@ GEM
color-tools (1.3.0)
crack (0.4.2)
safe_yaml (~> 1.0.0)
- crowdin-api (0.4.0)
- rest-client
+ crowdin-api (0.4.1)
+ rest-client (~> 1.8)
cucumber (1.3.19)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
@@ -435,7 +435,7 @@ GEM
activerecord (>= 4.0.0)
gherkin (2.12.2)
multi_json (~> 1.3)
- globalid (0.3.6)
+ globalid (0.3.7)
activesupport (>= 4.1.0)
globalize (5.0.1)
activemodel (>= 4.2.0, < 4.3)
@@ -593,16 +593,16 @@ GEM
rack_session_access (0.1.1)
builder (>= 2.0.0)
rack (>= 1.0.0)
- rails (4.2.6)
- actionmailer (= 4.2.6)
- actionpack (= 4.2.6)
- actionview (= 4.2.6)
- activejob (= 4.2.6)
- activemodel (= 4.2.6)
- activerecord (= 4.2.6)
- activesupport (= 4.2.6)
+ rails (4.2.7.1)
+ actionmailer (= 4.2.7.1)
+ actionpack (= 4.2.7.1)
+ actionview (= 4.2.7.1)
+ activejob (= 4.2.7.1)
+ activemodel (= 4.2.7.1)
+ activerecord (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.6)
+ railties (= 4.2.7.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@ -621,9 +621,9 @@ GEM
rails (> 3.1)
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
- railties (4.2.6)
- actionpack (= 4.2.6)
- activesupport (= 4.2.6)
+ railties (4.2.7.1)
+ actionpack (= 4.2.7.1)
+ activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
@@ -891,7 +891,7 @@ DEPENDENCIES
rack-protection!
rack-test (~> 0.6.2)
rack_session_access
- rails (~> 4.2.5)
+ rails (~> 4.2.7)
rails-angular-xss!
rails-observers
rails_12factor
@@ -935,4 +935,4 @@ DEPENDENCIES
will_paginate (~> 3.0)
BUNDLED WITH
- 1.11.2
+ 1.12.5
@@ -1408,12 +1408,12 @@ en:
notice_to_many_principals_to_display: "There are too many results.\nNarrow down the search by typing in the name of the new member (or group)."
notice_unable_delete_time_entry: "Unable to delete time log entry."
notice_unable_delete_version: "Unable to delete version."
- notice_user_missing_authentication_method: User has yet to chose a password or another way the sign in.
+ notice_user_missing_authentication_method: User has yet to choose a password or another way to sign in.
notice_user_invitation_resent: Another invitation has been sent to %{email}.
present_access_key_value: "Your %{key_name} is: %{value}"
notice_automatic_set_of_standard_type: "Set standard type automatically."
notice_logged_out: "You have been logged out."
- notice_wont_delete_auth_source: The authentication mode cannot be deleted as long as there are still users using it.
+ notice_wont_delete_auth_source: The authentication mode cannot be deleted as long as users are still using it.
notice_project_cannot_update_custom_fields: "You cannot update the project's available custom fields."
# Default format for numbers
@@ -1495,7 +1495,7 @@ en:
permission_view_changesets: "View repository revisions in OpenProject"
permission_view_commit_author_statistics: "View commit author statistics"
permission_view_work_package_watchers: "View watchers list"
- permission_view_work_packages: "View Work Packages"
+ permission_view_work_packages: "View work packages"
permission_view_messages: "View messages"
permission_view_project_associations: "View project dependencies"
permission_view_reportings: "View reportings"
@@ -202,7 +202,7 @@ en:
watchers:
label_loading: loading watchers...
- label_error_loading: An error occured while loading the watchers
+ label_error_loading: An error occurred while loading the watchers
label_search_watchers: Search watchers
label_add: Add watchers
label_discard: Discard selection
@@ -287,7 +287,7 @@ en:
change: "Change in planning"
due_date: "Due date"
empty: "(empty)"
- error: "An error has occured."
+ error: "An error has occurred."
errors:
not_implemented: "The timeline could not be rendered because it uses a feature that is not yet implemented."
report_comparison: "The timeline could not render the configured comparisons. Please check the appropriate section in the configuration, resetting it can help solve this problem."
@@ -357,13 +357,13 @@ en:
work_packages:
button_clear: "Clear"
comment_added: "The comment was successfully added."
- comment_send_failed: "An error has occured. Could not submit the comment."
+ comment_send_failed: "An error has occurred. Could not submit the comment."
comment_updated: "The comment was successfully updated."
description_filter: "Filter"
description_enter_text: "Enter text"
description_options_hide: "Hide options"
description_options_show: "Show options"
- error: "An error has occured."
+ error: "An error has occurred."
error_update_failed: "The work package could not be updated."
edit_attribute: "%{attribute} - Edit"
key_value: "%{key}: %{value}"
@@ -34,7 +34,7 @@ module OpenProject
module VERSION #:nodoc:
MAJOR = 5
MINOR = 0
- PATCH = 19
+ PATCH = 20
TINY = PATCH # Redmine compat
# Used by semver to define the special version (if any).
@@ -141,7 +141,7 @@
revision: 100,
comments: 'Committed by foo.'
)
- assert_no_difference "Changeset.count(conditions: 'user_id = 3')" do
+ assert_no_difference "Changeset.where(user_id: 3).count" do
post :committers, project_id: 1,
committers: { '0' => ['foo', '2'], '1' => ['dlopper', '3'] }
assert_redirected_to '/projects/ecookbook/repository/committers'
@@ -1,5 +1,5 @@
module OpenProject
module Announcements
- VERSION = "5.0.19"
+ VERSION = "5.0.20"
end
end
@@ -29,6 +29,6 @@
module OpenProject
module AuthPlugins
- VERSION = "5.0.19"
+ VERSION = "5.0.20"
end
end
@@ -35,6 +35,6 @@
module OpenProject
module Backlogs
- VERSION = "5.0.19"
+ VERSION = "5.0.20"
end
end
Oops, something went wrong.

0 comments on commit 25edf70

Please sign in to comment.