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
Tatuya Kamada
gitlab-ce
Commits
60045195
Commit
60045195
authored
Jan 23, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed tests, renamed files and methods
parent
8ffe586b
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
28 additions
and
6 deletions
+28
-6
app/assets/javascripts/dispatcher.js.es6
app/assets/javascripts/dispatcher.js.es6
+1
-1
app/controllers/projects/runners_controller.rb
app/controllers/projects/runners_controller.rb
+4
-0
app/controllers/projects/settings/ci_cd_controller.rb
app/controllers/projects/settings/ci_cd_controller.rb
+2
-2
app/helpers/gitlab_routing_helper.rb
app/helpers/gitlab_routing_helper.rb
+4
-0
spec/controllers/projects/settings/ci_cd_controller.rb
spec/controllers/projects/settings/ci_cd_controller.rb
+1
-1
spec/features/security/project/private_access_spec.rb
spec/features/security/project/private_access_spec.rb
+14
-0
spec/features/triggers_spec.rb
spec/features/triggers_spec.rb
+1
-1
spec/features/variables_spec.rb
spec/features/variables_spec.rb
+1
-1
No files found.
app/assets/javascripts/dispatcher.js.es6
View file @
60045195
...
...
@@ -259,7 +259,7 @@
new gl.ProtectedBranchCreate();
new gl.ProtectedBranchEditList();
break;
case 'projects:ci_cd
_pipelines
:show':
case 'projects:ci_cd:show':
new gl.ProjectVariables();
break;
case 'ci:lints:create':
...
...
app/controllers/projects/runners_controller.rb
View file @
60045195
...
...
@@ -4,6 +4,10 @@ class Projects::RunnersController < Projects::ApplicationController
layout
'project_settings'
def
index
redirect_to
namespace_project_settings_ci_cd_path
(
@project
.
namespace
,
@project
)
end
def
edit
end
...
...
app/controllers/projects/settings/ci_cd_controller.rb
View file @
60045195
...
...
@@ -5,7 +5,7 @@ module Projects
def
show
define_runners_variables
define_
project_variables
_variables
define_
secret
_variables
define_triggers_variables
define_badges_variables
end
...
...
@@ -20,7 +20,7 @@ module Projects
@shared_runners_count
=
@shared_runners
.
count
(
:all
)
end
def
define_
project_variables
_variables
def
define_
secret
_variables
@variable
=
Ci
::
Variable
.
new
end
...
...
app/helpers/gitlab_routing_helper.rb
View file @
60045195
...
...
@@ -215,4 +215,8 @@ module GitlabRoutingHelper
def
project_settings_members_path
(
project
,
*
args
)
namespace_project_settings_members_path
(
project
.
namespace
,
project
,
*
args
)
end
def
project_settings_ci_cd_path
(
project
,
*
args
)
namespace_project_settings_ci_cd_path
(
project
.
namespace
,
project
,
*
args
)
end
end
spec/controllers/projects/settings/ci_cd_
pipelines_controller_spec
.rb
→
spec/controllers/projects/settings/ci_cd_
controller
.rb
View file @
60045195
require
(
'spec_helper'
)
describe
Projects
::
Settings
::
CiCd
Pipelines
Controller
do
describe
Projects
::
Settings
::
CiCdController
do
let
(
:project
)
{
create
(
:empty_project
,
:public
,
:access_requestable
)
}
let
(
:user
)
{
create
(
:user
)
}
...
...
spec/features/security/project/private_access_spec.rb
View file @
60045195
...
...
@@ -82,6 +82,20 @@ describe "Private Project Access", feature: true do
it
{
is_expected
.
to
be_denied_for
(
:visitor
)
}
end
describe
"GET /:project_path/settings/members"
do
subject
{
namespace_project_settings_members_path
(
project
.
namespace
,
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:admin
)
}
it
{
is_expected
.
to
be_allowed_for
(
:owner
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:master
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:developer
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:reporter
).
of
(
project
)
}
it
{
is_expected
.
to
be_allowed_for
(
:guest
).
of
(
project
)
}
it
{
is_expected
.
to
be_denied_for
(
:user
)
}
it
{
is_expected
.
to
be_denied_for
(
:visitor
)
}
it
{
is_expected
.
to
be_denied_for
(
:external
)
}
end
describe
"GET /:project_path/settings/ci_cd"
do
subject
{
namespace_project_settings_ci_cd_path
(
project
.
namespace
,
project
)
}
...
...
spec/features/triggers_spec.rb
View file @
60045195
...
...
@@ -7,7 +7,7 @@ describe 'Triggers' do
before
do
@project
=
FactoryGirl
.
create
:empty_project
@project
.
team
<<
[
user
,
:master
]
visit
namespace_project_
triggers
_path
(
@project
.
namespace
,
@project
)
visit
namespace_project_
settings_ci_cd
_path
(
@project
.
namespace
,
@project
)
end
context
'create a trigger'
do
...
...
spec/features/variables_spec.rb
View file @
60045195
...
...
@@ -10,7 +10,7 @@ describe 'Project variables', js: true do
project
.
team
<<
[
user
,
:master
]
project
.
variables
<<
variable
visit
namespace_project_
variables
_path
(
project
.
namespace
,
project
)
visit
namespace_project_
settings_ci_cd
_path
(
project
.
namespace
,
project
)
end
it
'shows list of variables'
do
...
...
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