Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5978f535
Commit
5978f535
authored
Jul 06, 2017
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop offences
parent
1a7f9926
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
7 deletions
+5
-7
app/controllers/projects/settings/slacks_controller.rb
app/controllers/projects/settings/slacks_controller.rb
+1
-2
app/helpers/auth_helper.rb
app/helpers/auth_helper.rb
+1
-1
app/models/project.rb
app/models/project.rb
+1
-1
app/services/projects/slack_application_install_service.rb
app/services/projects/slack_application_install_service.rb
+1
-1
spec/controllers/projects/settings/slacks_controller_spec.rb
spec/controllers/projects/settings/slacks_controller_spec.rb
+1
-2
No files found.
app/controllers/projects/settings/slacks_controller.rb
View file @
5978f535
...
@@ -24,8 +24,7 @@ module Projects
...
@@ -24,8 +24,7 @@ module Projects
private
private
def
redirect_to_service_page
def
redirect_to_service_page
redirect_to
edit_namespace_project_service_path
(
redirect_to
edit_project_service_path
(
project
.
namespace
,
project
,
project
,
project
.
gitlab_slack_application_service
||
project
.
build_gitlab_slack_application_service
project
.
gitlab_slack_application_service
||
project
.
build_gitlab_slack_application_service
)
)
...
...
app/helpers/auth_helper.rb
View file @
5978f535
...
@@ -75,7 +75,7 @@ module AuthHelper
...
@@ -75,7 +75,7 @@ module AuthHelper
end
end
def
slack_redirect_uri
(
project
)
def
slack_redirect_uri
(
project
)
slack_auth_
namespace_project_settings_slack_url
(
project
.
namespace
,
project
)
slack_auth_
project_settings_slack_url
(
project
)
end
end
extend
self
extend
self
...
...
app/models/project.rb
View file @
5978f535
...
@@ -89,7 +89,7 @@ class Project < ActiveRecord::Base
...
@@ -89,7 +89,7 @@ class Project < ActiveRecord::Base
# Project services
# Project services
has_one
:campfire_service
has_one
:campfire_service
has_one
:drone_ci_service
has_one
:drone_ci_service
has_one
:gitlab_slack_application_service
,
dependent: :destroy
has_one
:gitlab_slack_application_service
has_one
:emails_on_push_service
has_one
:emails_on_push_service
has_one
:pipelines_email_service
has_one
:pipelines_email_service
has_one
:irker_service
has_one
:irker_service
...
...
app/services/projects/slack_application_install_service.rb
View file @
5978f535
...
@@ -55,7 +55,7 @@ module Projects
...
@@ -55,7 +55,7 @@ module Projects
HTTParty
.
get
(
SLACK_EXCHANGE_TOKEN_URL
,
query:
{
HTTParty
.
get
(
SLACK_EXCHANGE_TOKEN_URL
,
query:
{
client_id:
current_application_settings
.
slack_app_id
,
client_id:
current_application_settings
.
slack_app_id
,
client_secret:
current_application_settings
.
slack_app_secret
,
client_secret:
current_application_settings
.
slack_app_secret
,
redirect_uri:
slack_auth_
namespace_project_settings_slack_url
(
project
.
namespace
,
project
),
redirect_uri:
slack_auth_
project_settings_slack_url
(
project
),
code:
params
[
:code
]
code:
params
[
:code
]
})
})
end
end
...
...
spec/controllers/projects/settings/slacks_controller_spec.rb
View file @
5978f535
...
@@ -11,8 +11,7 @@ describe Projects::Settings::SlacksController do
...
@@ -11,8 +11,7 @@ describe Projects::Settings::SlacksController do
describe
'GET show'
do
describe
'GET show'
do
def
redirect_url
(
project
)
def
redirect_url
(
project
)
edit_namespace_project_service_path
(
edit_project_service_path
(
project
.
namespace
,
project
,
project
,
project
.
build_gitlab_slack_application_service
project
.
build_gitlab_slack_application_service
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment