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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
373411d1
Commit
373411d1
authored
7 years ago
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrected code style and titles
parent
bc7c6c68
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
6 deletions
+5
-6
app/controllers/projects/settings/integrations_controller.rb
app/controllers/projects/settings/integrations_controller.rb
+1
-1
app/helpers/gitlab_routing_helper.rb
app/helpers/gitlab_routing_helper.rb
+1
-0
app/views/layouts/nav/_project_settings.html.haml
app/views/layouts/nav/_project_settings.html.haml
+1
-1
app/views/shared/web_hooks/_form.html.haml
app/views/shared/web_hooks/_form.html.haml
+0
-2
spec/controllers/projects/settings/integrations_controller_spec.rb
...rollers/projects/settings/integrations_controller_spec.rb
+2
-2
No files found.
app/controllers/projects/settings/integrations_controller.rb
View file @
373411d1
...
@@ -4,8 +4,8 @@ module Projects
...
@@ -4,8 +4,8 @@ module Projects
include
ServiceParams
include
ServiceParams
before_action
:authorize_admin_project!
before_action
:authorize_admin_project!
layout
"project_settings"
layout
"project_settings"
def
show
def
show
@hooks
=
@project
.
hooks
@hooks
=
@project
.
hooks
@hook
=
ProjectHook
.
new
@hook
=
ProjectHook
.
new
...
...
This diff is collapsed.
Click to expand it.
app/helpers/gitlab_routing_helper.rb
View file @
373411d1
...
@@ -211,6 +211,7 @@ module GitlabRoutingHelper
...
@@ -211,6 +211,7 @@ module GitlabRoutingHelper
def
project_settings_integrations_path
(
project
,
*
args
)
def
project_settings_integrations_path
(
project
,
*
args
)
namespace_project_settings_integrations_path
(
project
.
namespace
,
project
,
*
args
)
namespace_project_settings_integrations_path
(
project
.
namespace
,
project
,
*
args
)
end
end
def
project_settings_members_path
(
project
,
*
args
)
def
project_settings_members_path
(
project
,
*
args
)
namespace_project_settings_members_path
(
project
.
namespace
,
project
,
*
args
)
namespace_project_settings_members_path
(
project
.
namespace
,
project
,
*
args
)
end
end
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/nav/_project_settings.html.haml
View file @
373411d1
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
%span
%span
Deploy Keys
Deploy Keys
=
nav_link
(
controller: :integrations
)
do
=
nav_link
(
controller: :integrations
)
do
=
link_to
namespace_project_settings_integrations_path
(
@project
.
namespace
,
@project
),
title:
'
Webhook
s'
do
=
link_to
namespace_project_settings_integrations_path
(
@project
.
namespace
,
@project
),
title:
'
Integration
s'
do
%span
%span
Integrations
Integrations
=
nav_link
(
controller: :protected_branches
)
do
=
nav_link
(
controller: :protected_branches
)
do
...
...
This diff is collapsed.
Click to expand it.
app/views/shared/web_hooks/_form.html.haml
View file @
373411d1
-
context_title
=
@project
?
'project'
:
'group'
.row.prepend-top-default
.row.prepend-top-default
.col-lg-3
.col-lg-3
%h4
.prepend-top-0
%h4
.prepend-top-0
...
...
This diff is collapsed.
Click to expand it.
spec/controllers/projects/settings/integrations_controller_spec.rb
View file @
373411d1
require
(
'spec_helper'
)
require
'spec_helper'
describe
Projects
::
Settings
::
IntegrationsController
do
describe
Projects
::
Settings
::
IntegrationsController
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
before
do
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
user
,
:master
]
...
...
This diff is collapsed.
Click to expand it.
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