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
b038bcf7
Commit
b038bcf7
authored
Jul 13, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove trigger_schedule_attributes and factory :ci_trigger_for_trigger_schedule
parent
3c197e74
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
9 deletions
+1
-9
app/controllers/projects/triggers_controller.rb
app/controllers/projects/triggers_controller.rb
+1
-2
spec/factories/ci/triggers.rb
spec/factories/ci/triggers.rb
+0
-7
No files found.
app/controllers/projects/triggers_controller.rb
View file @
b038bcf7
...
@@ -69,8 +69,7 @@ class Projects::TriggersController < Projects::ApplicationController
...
@@ -69,8 +69,7 @@ class Projects::TriggersController < Projects::ApplicationController
def
trigger_params
def
trigger_params
params
.
require
(
:trigger
).
permit
(
params
.
require
(
:trigger
).
permit
(
:description
,
:description
trigger_schedule_attributes:
[
:id
,
:active
,
:cron
,
:cron_timezone
,
:ref
]
)
)
end
end
end
end
spec/factories/ci/triggers.rb
View file @
b038bcf7
...
@@ -2,13 +2,6 @@ FactoryGirl.define do
...
@@ -2,13 +2,6 @@ FactoryGirl.define do
factory
:ci_trigger_without_token
,
class:
Ci
::
Trigger
do
factory
:ci_trigger_without_token
,
class:
Ci
::
Trigger
do
factory
:ci_trigger
do
factory
:ci_trigger
do
sequence
(
:token
)
{
|
n
|
"token
#{
n
}
"
}
sequence
(
:token
)
{
|
n
|
"token
#{
n
}
"
}
factory
:ci_trigger_for_trigger_schedule
do
token
{
SecureRandom
.
hex
(
15
)
}
owner
factory: :user
project
factory: :project
ref
'master'
end
end
end
end
end
end
end
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