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
4aaffb16
Commit
4aaffb16
authored
Jan 29, 2021
by
Yogi
Committed by
Olena Horal-Koretska
Jan 29, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply new GitLab UI for input fields in the file editor
parent
13682301
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+2
-2
app/views/shared/_commit_message_container.html.haml
app/views/shared/_commit_message_container.html.haml
+1
-1
app/views/shared/_new_commit_form.html.haml
app/views/shared/_new_commit_form.html.haml
+1
-1
changelogs/unreleased/new-gitlab-ui-blob-editor.yml
changelogs/unreleased/new-gitlab-ui-blob-editor.yml
+5
-0
No files found.
app/views/projects/blob/_editor.html.haml
View file @
4aaffb16
...
...
@@ -10,14 +10,14 @@
-
if
current_action?
(
:edit
)
||
current_action?
(
:update
)
%span
.float-left.gl-mr-3
=
text_field_tag
'file_path'
,
(
params
[
:file_path
]
||
@path
),
class:
'form-control new-file-path js-file-path-name-input'
class:
'form-control
gl-form-input
new-file-path js-file-path-name-input'
=
render
'template_selectors'
-
if
current_action?
(
:new
)
||
current_action?
(
:create
)
%span
.float-left.gl-mr-3
\/
=
text_field_tag
'file_name'
,
params
[
:file_name
],
placeholder:
"File name"
,
required:
true
,
class:
'form-control new-file-name js-file-path-name-input'
,
value:
params
[
:file_name
]
||
(
should_suggest_gitlab_ci_yml?
?
'.gitlab-ci.yml'
:
''
)
required:
true
,
class:
'form-control
gl-form-input
new-file-name js-file-path-name-input'
,
value:
params
[
:file_name
]
||
(
should_suggest_gitlab_ci_yml?
?
'.gitlab-ci.yml'
:
''
)
=
render
'template_selectors'
-
if
should_suggest_gitlab_ci_yml?
.js-suggest-gitlab-ci-yml
{
data:
{
target:
'#gitlab-ci-yml-selector'
,
...
...
app/views/shared/_commit_message_container.html.haml
View file @
4aaffb16
...
...
@@ -8,7 +8,7 @@
.max-width-marker
=
text_area_tag
'commit_message'
,
(
params
[
:commit_message
]
||
local_assigns
[
:text
]
||
local_assigns
[
:placeholder
]),
class:
'form-control js-commit-message'
,
placeholder:
local_assigns
[
:placeholder
],
class:
'form-control
gl-form-input
js-commit-message'
,
placeholder:
local_assigns
[
:placeholder
],
data:
descriptions
,
required:
true
,
rows:
(
local_assigns
[
:rows
]
||
3
),
id:
"commit_message-
#{
nonce
}
"
...
...
app/views/shared/_new_commit_form.html.haml
View file @
4aaffb16
...
...
@@ -10,7 +10,7 @@
.form-group.row.branch
=
label_tag
'branch_name'
,
_
(
'Target Branch'
),
class:
'col-form-label col-sm-2'
.col-sm-10
=
text_field_tag
'branch_name'
,
branch_name
,
required:
true
,
class:
"form-control js-branch-name ref-name"
=
text_field_tag
'branch_name'
,
branch_name
,
required:
true
,
class:
"form-control
gl-form-input
js-branch-name ref-name"
.js-create-merge-request-container
=
render
'shared/new_merge_request_checkbox'
...
...
changelogs/unreleased/new-gitlab-ui-blob-editor.yml
0 → 100644
View file @
4aaffb16
---
title
:
Apply new GitLab UI for input fields in file editor
merge_request
:
52461
author
:
Yogi (@yo)
type
:
other
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