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
Jérome Perrin
gitlab-ce
Commits
7461072f
Commit
7461072f
authored
Apr 07, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update code to remove no longer needed changes
parent
7cee650d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
7 deletions
+1
-7
app/models/ci/trigger.rb
app/models/ci/trigger.rb
+1
-1
app/views/projects/triggers/_form.html.haml
app/views/projects/triggers/_form.html.haml
+0
-6
No files found.
app/models/ci/trigger.rb
View file @
7461072f
...
@@ -14,7 +14,7 @@ module Ci
...
@@ -14,7 +14,7 @@ module Ci
before_validation
:set_default_values
before_validation
:set_default_values
accepts_nested_attributes_for
:trigger_schedule
,
allow_destroy:
true
accepts_nested_attributes_for
:trigger_schedule
def
set_default_values
def
set_default_values
self
.
token
=
SecureRandom
.
hex
(
15
)
if
self
.
token
.
blank?
self
.
token
=
SecureRandom
.
hex
(
15
)
if
self
.
token
.
blank?
...
...
app/views/projects/triggers/_form.html.haml
View file @
7461072f
...
@@ -31,9 +31,3 @@
...
@@ -31,9 +31,3 @@
=
schedule_fields
.
text_field
:ref
,
class:
"form-control"
,
title:
'Branch or tag is required.'
,
placeholder:
"master"
=
schedule_fields
.
text_field
:ref
,
class:
"form-control"
,
title:
'Branch or tag is required.'
,
placeholder:
"master"
.help-block
Existing branch name, tag
.help-block
Existing branch name, tag
=
f
.
submit
btn_text
,
class:
"btn btn-save"
=
f
.
submit
btn_text
,
class:
"btn btn-save"
:javascript
var
availableRefs
=
#{
@project
.
repository
.
ref_names
.
to_json
}
;
new
NewBranchForm
(
$
(
'
.js-new-pipeline-form
'
),
availableRefs
)
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