Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

redmine 4.1.x and rails 5.1+ integration; #55

Open
wants to merge 1 commit into
base: stable-2.8
Choose a base branch
from
Open

redmine 4.1.x and rails 5.1+ integration; #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/controllers/mylyn_connector/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions app/controllers/mylyn_connector/custom_fields_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions app/controllers/mylyn_connector/information_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/mylyn_connector/issue_categories_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/mylyn_connector/issue_priorities_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/mylyn_connector/issue_status_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions app/controllers/mylyn_connector/issues_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ 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
include QueriesHelper
helper :sort
include SortHelper


def show
respond_to do |format|
format.xml {render :layout => nil}
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/mylyn_connector/projects_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,5 +16,5 @@ def all
format.xml {render :layout => nil}
end
end

end
2 changes: 1 addition & 1 deletion app/controllers/mylyn_connector/queries_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/mylyn_connector/settings_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/mylyn_connector/time_entry_activities_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/mylyn_connector/trackers_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/mylyn_connector/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/mylyn_connector/versions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/mylyn_connector/test/integration_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module MylynConnector

module Test

class IntegrationTest < ActionController::IntegrationTest
class IntegrationTest < ActionDispatch::IntegrationTest

include MylynConnector::Version

Expand Down