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
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
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
22 deletions
+21
-22
app/views/projects/_commit_button.html.haml
app/views/projects/_commit_button.html.haml
+9
-0
app/views/projects/edit_tree/show.html.haml
app/views/projects/edit_tree/show.html.haml
+5
-10
app/views/projects/new_tree/show.html.haml
app/views/projects/new_tree/show.html.haml
+3
-8
features/project/source/browse_files.feature
features/project/source/browse_files.feature
+2
-2
features/steps/project/source/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 @@
...
@@ -23,16 +23,11 @@
%i
.fa.fa-spinner.fa-spin
%i
.fa.fa-spinner.fa-spin
=
render
'shared/commit_message_container'
,
params:
params
,
=
render
'shared/commit_message_container'
,
params:
params
,
placeholder:
"Update
#{
@blob
.
name
}
"
placeholder:
"Update
#{
@blob
.
name
}
"
.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"
=
hidden_field_tag
'from_merge_request_id'
,
params
[
:from_merge_request_id
]
=
hidden_field_tag
'from_merge_request_id'
,
params
[
:from_merge_request_id
]
.commit-button-annotation
=
render
'projects/commit_button'
,
ref:
@ref
,
=
button_tag
"Commit changes"
,
class:
'btn commit-btn js-commit-button btn-primary'
cancel_path:
@after_edit_path
.message
to branch
%strong
=
@ref
=
link_to
"Cancel"
,
@after_edit_path
,
class:
"btn btn-cancel"
,
data:
{
confirm:
leave_edit_message
}
:javascript
:javascript
ace
.
config
.
set
(
"
modePath
"
,
gon
.
relative_url_root
+
"
#{
Gitlab
::
Application
.
config
.
assets
.
prefix
}
/ace
"
)
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 @@
...
@@ -27,14 +27,9 @@
.file-content.code
.file-content.code
%pre
#editor
=
params
[
:content
]
%pre
#editor
=
params
[
:content
]
.form-actions
=
hidden_field_tag
'content'
,
''
,
id:
'file-content'
=
hidden_field_tag
'content'
,
''
,
id:
"file-content"
=
render
'projects/commit_button'
,
ref:
@ref
,
.commit-button-annotation
cancel_path:
project_tree_path
(
@project
,
@id
)
=
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
}
:javascript
:javascript
ace
.
config
.
set
(
"
modePath
"
,
gon
.
relative_url_root
+
"
#{
Gitlab
::
Application
.
config
.
assets
.
prefix
}
/ace-src-noconflict
"
)
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
...
@@ -30,7 +30,7 @@ Feature: Project Source Browse files
And
I edit code
And
I edit code
And
I fill the new file name
And
I fill the new file name
And
I fill the commit message
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
Then
I am redirected to the new file
And
I should see its new content
And
I should see its new content
...
@@ -46,7 +46,7 @@ Feature: Project Source Browse files
...
@@ -46,7 +46,7 @@ Feature: Project Source Browse files
And
I click button
"Edit"
And
I click button
"Edit"
And
I edit code
And
I edit code
And
I fill the commit message
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"
Then
I am redirected to the
".gitignore"
And
I should see its new content
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
...
@@ -69,8 +69,8 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
click_link
'Diff'
click_link
'Diff'
end
end
step
'I click on "Commit
c
hanges"'
do
step
'I click on "Commit
C
hanges"'
do
click_button
'Commit
c
hanges'
click_button
'Commit
C
hanges'
end
end
step
'I click on "Remove"'
do
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