BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
166c215a
Commit
166c215a
authored
Oct 03, 2014
by
Ciro Santilli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make new and edit file submit more uniform
parent
51ed8b7e
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
19 deletions
+18
-19
_commit_button.html.haml
app/views/projects/_commit_button.html.haml
+9
-0
show.html.haml
app/views/projects/edit_tree/show.html.haml
+2
-7
show.html.haml
app/views/projects/new_tree/show.html.haml
+3
-8
browse_files.feature
features/project/source/browse_files.feature
+2
-2
browse_files.rb
features/steps/project/source/browse_files.rb
+2
-2
No files found.
app/views/projects/_commit_button.html.haml
0 → 100644
View file @
166c215a
.form-actions
.commit-button-annotation
=
button_tag
'Commit Changes'
,
class:
'btn commit-btn js-commit-button btn-create'
.message
to branch
%strong
=
ref
=
link_to
'Cancel'
,
cancel_path
,
class:
'btn btn-cancel'
,
data:
{
confirm:
leave_edit_message
}
app/views/projects/edit_tree/show.html.haml
View file @
166c215a
...
...
@@ -23,16 +23,11 @@
%i
.fa.fa-spinner.fa-spin
=
render
'shared/commit_message_container'
,
params:
params
,
placeholder:
"Update
#{
@blob
.
name
}
"
.form-actions
=
hidden_field_tag
'last_commit'
,
@last_commit
=
hidden_field_tag
'content'
,
''
,
id:
"file-content"
=
hidden_field_tag
'from_merge_request_id'
,
params
[
:from_merge_request_id
]
.commit-button-annotation
=
button_tag
"Commit changes"
,
class:
'btn commit-btn js-commit-button btn-primary'
.message
to branch
%strong
=
@ref
=
link_to
"Cancel"
,
@after_edit_path
,
class:
"btn btn-cancel"
,
data:
{
confirm:
leave_edit_message
}
=
render
'projects/commit_button'
,
ref:
@ref
,
cancel_path:
@after_edit_path
:javascript
ace
.
config
.
set
(
"modePath"
,
gon
.
relative_url_root
+
"
#{
Gitlab
::
Application
.
config
.
assets
.
prefix
}
/ace"
)
...
...
app/views/projects/new_tree/show.html.haml
View file @
166c215a
...
...
@@ -27,14 +27,9 @@
.file-content.code
%pre
#editor
=
params
[
:content
]
.form-actions
=
hidden_field_tag
'content'
,
''
,
id:
"file-content"
.commit-button-annotation
=
button_tag
"Commit changes"
,
class:
'btn commit-btn js-commit-button btn-create'
.message
to branch
%strong
=
@ref
=
link_to
"Cancel"
,
project_tree_path
(
@project
,
@id
),
class:
"btn btn-cancel"
,
data:
{
confirm:
leave_edit_message
}
=
hidden_field_tag
'content'
,
''
,
id:
'file-content'
=
render
'projects/commit_button'
,
ref:
@ref
,
cancel_path:
project_tree_path
(
@project
,
@id
)
:javascript
ace
.
config
.
set
(
"modePath"
,
gon
.
relative_url_root
+
"
#{
Gitlab
::
Application
.
config
.
assets
.
prefix
}
/ace-src-noconflict"
)
...
...
features/project/source/browse_files.feature
View file @
166c215a
...
...
@@ -30,7 +30,7 @@ Feature: Project Source Browse files
And
I edit code
And
I fill the new file name
And
I fill the commit message
And
I click on
"Commit
c
hanges"
And
I click on
"Commit
C
hanges"
Then
I am redirected to the new file
And
I should see its new content
...
...
@@ -46,7 +46,7 @@ Feature: Project Source Browse files
And
I click button
"Edit"
And
I edit code
And
I fill the commit message
And
I click on
"Commit
c
hanges"
And
I click on
"Commit
C
hanges"
Then
I am redirected to the
".gitignore"
And
I should see its new content
...
...
features/steps/project/source/browse_files.rb
View file @
166c215a
...
...
@@ -69,8 +69,8 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
click_link
'Diff'
end
step
'I click on "Commit
c
hanges"'
do
click_button
'Commit
c
hanges'
step
'I click on "Commit
C
hanges"'
do
click_button
'Commit
C
hanges'
end
step
'I click on "Remove"'
do
...
...
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