BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
373411d1
Commit
373411d1
authored
Jan 16, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrected code style and titles
parent
bc7c6c68
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
6 deletions
+5
-6
integrations_controller.rb
app/controllers/projects/settings/integrations_controller.rb
+1
-1
gitlab_routing_helper.rb
app/helpers/gitlab_routing_helper.rb
+1
-0
_project_settings.html.haml
app/views/layouts/nav/_project_settings.html.haml
+1
-1
_form.html.haml
app/views/shared/web_hooks/_form.html.haml
+0
-2
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
include
ServiceParams
before_action
:authorize_admin_project!
layout
"project_settings"
def
show
@hooks
=
@project
.
hooks
@hook
=
ProjectHook
.
new
...
...
app/helpers/gitlab_routing_helper.rb
View file @
373411d1
...
...
@@ -211,6 +211,7 @@ module GitlabRoutingHelper
def
project_settings_integrations_path
(
project
,
*
args
)
namespace_project_settings_integrations_path
(
project
.
namespace
,
project
,
*
args
)
end
def
project_settings_members_path
(
project
,
*
args
)
namespace_project_settings_members_path
(
project
.
namespace
,
project
,
*
args
)
end
...
...
app/views/layouts/nav/_project_settings.html.haml
View file @
373411d1
...
...
@@ -9,7 +9,7 @@
%span
Deploy Keys
=
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
Integrations
=
nav_link
(
controller: :protected_branches
)
do
...
...
app/views/shared/web_hooks/_form.html.haml
View file @
373411d1
-
context_title
=
@project
?
'project'
:
'group'
.row.prepend-top-default
.col-lg-3
%h4
.prepend-top-0
...
...
spec/controllers/projects/settings/integrations_controller_spec.rb
View file @
373411d1
require
(
'spec_helper'
)
require
'spec_helper'
describe
Projects
::
Settings
::
IntegrationsController
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
project
.
team
<<
[
user
,
:master
]
...
...
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