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
07a9d44d
Commit
07a9d44d
authored
Feb 22, 2014
by
Ciro Santillli
Committed by
Ciro Santilli
Apr 16, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit message textareas have 72 char mark line.
parent
9b52affe
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
38 additions
and
5 deletions
+38
-5
app/assets/stylesheets/generic/forms.scss
app/assets/stylesheets/generic/forms.scss
+23
-0
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+2
-0
app/views/projects/blob/_remove.html.haml
app/views/projects/blob/_remove.html.haml
+2
-1
app/views/projects/edit_tree/show.html.haml
app/views/projects/edit_tree/show.html.haml
+2
-1
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+2
-2
app/views/projects/new_tree/show.html.haml
app/views/projects/new_tree/show.html.haml
+2
-1
app/views/shared/_commit_message_container.html.haml
app/views/shared/_commit_message_container.html.haml
+5
-0
No files found.
app/assets/stylesheets/generic/forms.scss
View file @
07a9d44d
...
@@ -75,3 +75,26 @@ label {
...
@@ -75,3 +75,26 @@ label {
width
:
200px
;
width
:
200px
;
}
}
}
}
.commit-message-container
{
background-color
:
$body-bg
;
position
:
relative
;
font-family
:
$monospace_font
;
$left
:
12px
;
.max-width-marker
{
color
:
rgba
(
0
,
0
,
0
,
0
.0
);
font-family
:
inherit
;
left
:
$left
;
height
:
100%
;
border-right
:
1px
solid
mix
(
$input-border
,
white
);
position
:
absolute
;
z-index
:
1
;
}
>
textarea
{
background-color
:
rgba
(
0
,
0
,
0
,
0
.0
);
font-family
:
inherit
;
padding-left
:
$left
;
position
:
relative
;
z-index
:
2
;
}
}
app/assets/stylesheets/sections/tree.scss
View file @
07a9d44d
...
@@ -151,3 +151,5 @@
...
@@ -151,3 +151,5 @@
}
}
}
}
}
}
#modal-remove-blob
>
.modal-dialog
{
width
:
850px
;
}
app/views/projects/blob/_remove.html.haml
View file @
07a9d44d
...
@@ -14,7 +14,8 @@
...
@@ -14,7 +14,8 @@
=
label_tag
'commit_message'
,
class:
"control-label"
do
=
label_tag
'commit_message'
,
class:
"control-label"
do
Commit message
Commit message
.col-sm-10
.col-sm-10
=
text_area_tag
'commit_message'
,
params
[
:commit_message
],
placeholder:
"Removed this file because..."
,
required:
true
,
rows:
3
,
class:
'form-control'
=
render
'shared/commit_message_container'
,
{
textarea:
text_area_tag
(
'commit_message'
,
params
[
:commit_message
],
placeholder:
"Removed this file because..."
,
required:
true
,
rows:
3
,
class:
'form-control'
)}
.form-group
.form-group
.col-sm-2
.col-sm-2
.col-sm-10
.col-sm-10
...
...
app/views/projects/edit_tree/show.html.haml
View file @
07a9d44d
...
@@ -19,7 +19,8 @@
...
@@ -19,7 +19,8 @@
=
label_tag
'commit_message'
,
class:
"control-label"
do
=
label_tag
'commit_message'
,
class:
"control-label"
do
Commit message
Commit message
.col-sm-10
.col-sm-10
=
text_area_tag
'commit_message'
,
''
,
placeholder:
"Update
#{
@blob
.
name
}
"
,
required:
true
,
rows:
3
,
class:
'form-control'
=
render
'shared/commit_message_container'
,
{
textarea:
text_area_tag
(
'commit_message'
,
''
,
placeholder:
"Update
#{
@blob
.
name
}
"
,
required:
true
,
rows:
3
,
class:
'form-control'
)}
.form-actions
.form-actions
=
hidden_field_tag
'last_commit'
,
@last_commit
=
hidden_field_tag
'last_commit'
,
@last_commit
=
hidden_field_tag
'content'
,
''
,
id:
"file-content"
=
hidden_field_tag
'content'
,
''
,
id:
"file-content"
...
...
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
07a9d44d
...
@@ -21,7 +21,6 @@
...
@@ -21,7 +21,6 @@
=
link_to
"click here"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
link_to
"click here"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
for instructions.
for instructions.
.js-toggle-container
.js-toggle-container
%p
%p
If you want to modify merge commit message -
If you want to modify merge commit message -
...
@@ -31,7 +30,8 @@
...
@@ -31,7 +30,8 @@
.form-group
.form-group
=
label_tag
:merge_commit_message
,
"Commit message"
,
class:
'control-label'
=
label_tag
:merge_commit_message
,
"Commit message"
,
class:
'control-label'
.col-sm-10
.col-sm-10
=
text_area_tag
:merge_commit_message
,
@merge_request
.
merge_commit_message
,
class:
"form-control js-gfm-input"
,
rows:
14
,
required:
true
=
render
'shared/commit_message_container'
,
{
textarea:
text_area_tag
(
:merge_commit_message
,
@merge_request
.
merge_commit_message
,
class:
"form-control js-gfm-input"
,
rows:
14
,
required:
true
)}
%p
.hint
%p
.hint
The recommended maximum line length is 52 characters for the first line and 72 characters for all following lines.
The recommended maximum line length is 52 characters for the first line and 72 characters for all following lines.
...
...
app/views/projects/new_tree/show.html.haml
View file @
07a9d44d
...
@@ -24,7 +24,8 @@
...
@@ -24,7 +24,8 @@
=
label_tag
'commit_message'
,
class:
"control-label"
do
=
label_tag
'commit_message'
,
class:
"control-label"
do
Commit message
Commit message
.col-sm-10
.col-sm-10
=
text_area_tag
'commit_message'
,
params
[
:commit_message
],
placeholder:
"Added new file"
,
required:
true
,
rows:
3
,
class:
'form-control'
=
render
'shared/commit_message_container'
,
{
textarea:
text_area_tag
(
'commit_message'
,
params
[
:commit_message
],
placeholder:
"Added new file"
,
required:
true
,
rows:
3
,
class:
'form-control'
)}
.file-holder
.file-holder
.file-title
.file-title
...
...
app/views/shared/_commit_message_container.html.haml
0 → 100644
View file @
07a9d44d
.commit-message-container
.max-width-marker
-# When the `ch` CSS length unit becomes widely supported `http://www.quirksmode.org/css/units-values` remove this workaround.
=
'a'
*
72
=
textarea
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