From 806033852c58700d2cdca94a05af78c126505531 Mon Sep 17 00:00:00 2001 From: Ivan Egorov Date: Thu, 13 Feb 2020 16:56:41 +0300 Subject: [PATCH] redmine 4.1.x and rails 5.1+ integration; --- .../mylyn_connector/application_controller.rb | 6 +++--- .../mylyn_connector/custom_fields_controller.rb | 4 ++-- .../mylyn_connector/information_controller.rb | 6 +++--- .../mylyn_connector/issue_categories_controller.rb | 2 +- .../mylyn_connector/issue_priorities_controller.rb | 2 +- .../mylyn_connector/issue_status_controller.rb | 2 +- app/controllers/mylyn_connector/issues_controller.rb | 12 ++++++------ .../mylyn_connector/projects_controller.rb | 4 ++-- .../mylyn_connector/queries_controller.rb | 2 +- .../mylyn_connector/settings_controller.rb | 2 +- .../time_entry_activities_controller.rb | 2 +- .../mylyn_connector/trackers_controller.rb | 2 +- app/controllers/mylyn_connector/users_controller.rb | 4 ++-- .../mylyn_connector/versions_controller.rb | 2 +- lib/mylyn_connector/test/integration_test.rb | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/controllers/mylyn_connector/application_controller.rb b/app/controllers/mylyn_connector/application_controller.rb index 33a4609..e32d8ae 100644 --- a/app/controllers/mylyn_connector/application_controller.rb +++ b/app/controllers/mylyn_connector/application_controller.rb @@ -1,8 +1,8 @@ class MylynConnector::ApplicationController < ApplicationController unloadable - + include MylynConnector::Rescue - - before_filter :require_login #Require a successful login to render page + + before_action :require_login #Require a successful login to render page end diff --git a/app/controllers/mylyn_connector/custom_fields_controller.rb b/app/controllers/mylyn_connector/custom_fields_controller.rb index dbb1c44..bbdcbda 100644 --- a/app/controllers/mylyn_connector/custom_fields_controller.rb +++ b/app/controllers/mylyn_connector/custom_fields_controller.rb @@ -4,9 +4,9 @@ class MylynConnector::CustomFieldsController < MylynConnector::ApplicationContro unloadable accept_api_auth :all - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token helper MylynConnector::MylynHelper - + def all @custom_fields = CustomField.all diff --git a/app/controllers/mylyn_connector/information_controller.rb b/app/controllers/mylyn_connector/information_controller.rb index cdc2a6c..0fa837f 100644 --- a/app/controllers/mylyn_connector/information_controller.rb +++ b/app/controllers/mylyn_connector/information_controller.rb @@ -4,9 +4,9 @@ class MylynConnector::InformationController < MylynConnector::ApplicationControl unloadable accept_api_auth :version, :token, :authtest - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token helper MylynConnector::MylynHelper - + def version @data = MylynConnector::Version.to_a @@ -18,7 +18,7 @@ def version def token #Workaround: we need a session, some operations does'nt support key-auth self.logged_user = User.current unless User.current.anonymous? - + render :xml => form_authenticity_token end diff --git a/app/controllers/mylyn_connector/issue_categories_controller.rb b/app/controllers/mylyn_connector/issue_categories_controller.rb index 097873f..5fc75e1 100644 --- a/app/controllers/mylyn_connector/issue_categories_controller.rb +++ b/app/controllers/mylyn_connector/issue_categories_controller.rb @@ -4,7 +4,7 @@ class MylynConnector::IssueCategoriesController < MylynConnector::ApplicationCon unloadable accept_api_auth :all - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token helper MylynConnector::MylynHelper def all diff --git a/app/controllers/mylyn_connector/issue_priorities_controller.rb b/app/controllers/mylyn_connector/issue_priorities_controller.rb index ee314ee..305e0d4 100644 --- a/app/controllers/mylyn_connector/issue_priorities_controller.rb +++ b/app/controllers/mylyn_connector/issue_priorities_controller.rb @@ -4,7 +4,7 @@ class MylynConnector::IssuePrioritiesController < MylynConnector::ApplicationCon unloadable accept_api_auth :all - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token helper MylynConnector::MylynHelper def all diff --git a/app/controllers/mylyn_connector/issue_status_controller.rb b/app/controllers/mylyn_connector/issue_status_controller.rb index 6e7a96e..573ac23 100644 --- a/app/controllers/mylyn_connector/issue_status_controller.rb +++ b/app/controllers/mylyn_connector/issue_status_controller.rb @@ -4,7 +4,7 @@ class MylynConnector::IssueStatusController < MylynConnector::ApplicationControl unloadable accept_api_auth :all - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token helper MylynConnector::MylynHelper def all diff --git a/app/controllers/mylyn_connector/issues_controller.rb b/app/controllers/mylyn_connector/issues_controller.rb index 0696287..98e4d21 100644 --- a/app/controllers/mylyn_connector/issues_controller.rb +++ b/app/controllers/mylyn_connector/issues_controller.rb @@ -5,12 +5,12 @@ class MylynConnector::IssuesController < MylynConnector::ApplicationController accept_api_auth :show, :index, :list, :updated_since - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token - before_filter :find_optional_project, :only => [:index] - before_filter :find_issue, :only => [:show] - before_filter :find_project, :only => [:show] - before_filter :authorize + before_action :find_optional_project, :only => [:index] + before_action :find_issue, :only => [:show] + before_action :find_project, :only => [:show] + before_action :authorize helper MylynConnector::MylynHelper helper :queries @@ -18,7 +18,7 @@ class MylynConnector::IssuesController < MylynConnector::ApplicationController helper :sort include SortHelper - + def show respond_to do |format| format.xml {render :layout => nil} diff --git a/app/controllers/mylyn_connector/projects_controller.rb b/app/controllers/mylyn_connector/projects_controller.rb index 48eb334..eab1506 100644 --- a/app/controllers/mylyn_connector/projects_controller.rb +++ b/app/controllers/mylyn_connector/projects_controller.rb @@ -4,7 +4,7 @@ class MylynConnector::ProjectsController < MylynConnector::ApplicationController unloadable accept_api_auth :all - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token helper MylynConnector::MylynHelper def all @@ -16,5 +16,5 @@ def all format.xml {render :layout => nil} end end - + end diff --git a/app/controllers/mylyn_connector/queries_controller.rb b/app/controllers/mylyn_connector/queries_controller.rb index 2911f5e..e32a17a 100644 --- a/app/controllers/mylyn_connector/queries_controller.rb +++ b/app/controllers/mylyn_connector/queries_controller.rb @@ -4,7 +4,7 @@ class MylynConnector::QueriesController < MylynConnector::ApplicationController unloadable accept_api_auth :all - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token helper MylynConnector::MylynHelper def all diff --git a/app/controllers/mylyn_connector/settings_controller.rb b/app/controllers/mylyn_connector/settings_controller.rb index 37fb5cb..c94f10f 100644 --- a/app/controllers/mylyn_connector/settings_controller.rb +++ b/app/controllers/mylyn_connector/settings_controller.rb @@ -4,7 +4,7 @@ class MylynConnector::SettingsController < MylynConnector::ApplicationController unloadable accept_api_auth :all - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token helper MylynConnector::MylynHelper def all diff --git a/app/controllers/mylyn_connector/time_entry_activities_controller.rb b/app/controllers/mylyn_connector/time_entry_activities_controller.rb index 97ffa57..4e07586 100644 --- a/app/controllers/mylyn_connector/time_entry_activities_controller.rb +++ b/app/controllers/mylyn_connector/time_entry_activities_controller.rb @@ -4,7 +4,7 @@ class MylynConnector::TimeEntryActivitiesController < MylynConnector::Applicatio unloadable accept_api_auth :all - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token helper MylynConnector::MylynHelper def all diff --git a/app/controllers/mylyn_connector/trackers_controller.rb b/app/controllers/mylyn_connector/trackers_controller.rb index 315f967..3b7287d 100644 --- a/app/controllers/mylyn_connector/trackers_controller.rb +++ b/app/controllers/mylyn_connector/trackers_controller.rb @@ -4,7 +4,7 @@ class MylynConnector::TrackersController < MylynConnector::ApplicationController unloadable accept_api_auth :all - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token helper MylynConnector::MylynHelper def all diff --git a/app/controllers/mylyn_connector/users_controller.rb b/app/controllers/mylyn_connector/users_controller.rb index df544d5..158386f 100644 --- a/app/controllers/mylyn_connector/users_controller.rb +++ b/app/controllers/mylyn_connector/users_controller.rb @@ -2,9 +2,9 @@ class MylynConnector::UsersController < MylynConnector::ApplicationController unloadable - + accept_api_auth :all - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token helper MylynConnector::MylynHelper def all diff --git a/app/controllers/mylyn_connector/versions_controller.rb b/app/controllers/mylyn_connector/versions_controller.rb index 05cd50b..ed2a553 100644 --- a/app/controllers/mylyn_connector/versions_controller.rb +++ b/app/controllers/mylyn_connector/versions_controller.rb @@ -4,7 +4,7 @@ class MylynConnector::VersionsController < MylynConnector::ApplicationController unloadable accept_api_auth :all - skip_before_filter :verify_authenticity_token + skip_before_action :verify_authenticity_token helper MylynConnector::MylynHelper def all diff --git a/lib/mylyn_connector/test/integration_test.rb b/lib/mylyn_connector/test/integration_test.rb index 5d9fef7..1ead3b9 100644 --- a/lib/mylyn_connector/test/integration_test.rb +++ b/lib/mylyn_connector/test/integration_test.rb @@ -2,7 +2,7 @@ module MylynConnector module Test - class IntegrationTest < ActionController::IntegrationTest + class IntegrationTest < ActionDispatch::IntegrationTest include MylynConnector::Version