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
cfdae8f1
Commit
cfdae8f1
authored
Jan 17, 2017
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'pmq20/gitlab-ce-psvr/persisted' into 'master'
Mark Commits as persisted See merge request !8604
parents
e7fdb1aa
632d22ac
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
app/models/commit.rb
app/models/commit.rb
+8
-0
app/views/projects/commit/_change.html.haml
app/views/projects/commit/_change.html.haml
+1
-1
No files found.
app/models/commit.rb
View file @
cfdae8f1
...
@@ -318,6 +318,14 @@ class Commit
...
@@ -318,6 +318,14 @@ class Commit
Gitlab
::
Diff
::
FileCollection
::
Commit
.
new
(
self
,
diff_options:
diff_options
)
Gitlab
::
Diff
::
FileCollection
::
Commit
.
new
(
self
,
diff_options:
diff_options
)
end
end
def
persisted?
true
end
def
touch
# no-op but needs to be defined since #persisted? is defined
end
private
private
def
commit_reference
(
from_project
,
referable_commit_id
,
full:
false
)
def
commit_reference
(
from_project
,
referable_commit_id
,
full:
false
)
...
...
app/views/projects/commit/_change.html.haml
View file @
cfdae8f1
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
.page-title
==
#{
label
}
this
#{
commit
.
change_type_title
(
current_user
)
}
%h3
.page-title
==
#{
label
}
this
#{
commit
.
change_type_title
(
current_user
)
}
.modal-body
.modal-body
=
form_tag
send
(
"
#{
type
.
underscore
}
_namespace_project_commit_path"
,
@project
.
namespace
,
@project
,
commit
.
id
)
,
method: :post
,
remote:
false
,
class:
"form-horizontal js-
#{
type
}
-form js-requires-input"
do
=
form_tag
[
type
.
underscore
,
@project
.
namespace
,
@project
,
commit
]
,
method: :post
,
remote:
false
,
class:
"form-horizontal js-
#{
type
}
-form js-requires-input"
do
.form-group.branch
.form-group.branch
=
label_tag
'target_branch'
,
target_label
,
class:
'control-label'
=
label_tag
'target_branch'
,
target_label
,
class:
'control-label'
.col-sm-10
.col-sm-10
...
...
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