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
407d5638
Commit
407d5638
authored
Jan 11, 2018
by
Jose Ivan Vargas
Committed by
Tim Zallmann
Jan 11, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix up Web IDE user preference copy and buttons
parent
c90fcf1a
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
8 deletions
+11
-8
app/assets/images/multi-editor-on.png
app/assets/images/multi-editor-on.png
+0
-0
app/helpers/blob_helper.rb
app/helpers/blob_helper.rb
+1
-1
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+0
-2
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+2
-2
changelogs/unreleased/41789-fix-up-web-ide-user-preference-copy-and-buttons.yml
...41789-fix-up-web-ide-user-preference-copy-and-buttons.yml
+5
-0
spec/features/projects/tree/create_directory_spec.rb
spec/features/projects/tree/create_directory_spec.rb
+1
-1
spec/features/projects/tree/create_file_spec.rb
spec/features/projects/tree/create_file_spec.rb
+1
-1
spec/features/projects/tree/upload_file_spec.rb
spec/features/projects/tree/upload_file_spec.rb
+1
-1
No files found.
app/assets/images/multi-editor-on.png
View replaced file @
c90fcf1a
View file @
407d5638
5.34 KB
|
W:
|
H:
3.88 KB
|
W:
|
H:
2-up
Swipe
Onion skin
app/helpers/blob_helper.rb
View file @
407d5638
...
@@ -46,7 +46,7 @@ module BlobHelper
...
@@ -46,7 +46,7 @@ module BlobHelper
end
end
def
ide_edit_text
def
ide_edit_text
"
#{
_
(
'
Multi Edit'
)
}
<span class='label label-primary'>
#{
_
(
'Beta'
)
}
</span>"
.
html_safe
"
#{
_
(
'
Web IDE'
)
}
"
end
end
def
ide_blob_link
(
project
=
@project
,
ref
=
@ref
,
path
=
@path
,
options
=
{})
def
ide_blob_link
(
project
=
@project
,
ref
=
@ref
,
path
=
@path
,
options
=
{})
...
...
app/views/layouts/header/_default.html.haml
View file @
407d5638
...
@@ -56,8 +56,6 @@
...
@@ -56,8 +56,6 @@
=
link_to
"Profile"
,
current_user
,
class:
'profile-link'
,
data:
{
user:
current_user
.
username
}
=
link_to
"Profile"
,
current_user
,
class:
'profile-link'
,
data:
{
user:
current_user
.
username
}
%li
%li
=
link_to
"Settings"
,
profile_path
=
link_to
"Settings"
,
profile_path
%li
=
link_to
"Turn on multi edit"
,
profile_preferences_path
-
if
current_user
-
if
current_user
%li
%li
=
link_to
"Help"
,
help_path
=
link_to
"Help"
,
help_path
...
...
app/views/profiles/preferences/show.html.haml
View file @
407d5638
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
,
html:
{
class:
'row prepend-top-default js-preferences-form'
}
do
|
f
|
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
,
html:
{
class:
'row prepend-top-default js-preferences-form'
}
do
|
f
|
.col-lg-4
.col-lg-4
%h4
.prepend-top-0
%h4
.prepend-top-0
GitLab multi file editor
Web IDE (Beta)
%p
Unlock an additional editing experience which makes it possible to edit and commit multiple files
%p
Enable the new web IDE on this device to make it possible to open and edit multiple files with a single commit
.col-lg-8.multi-file-editor-options
.col-lg-8.multi-file-editor-options
=
label_tag
do
=
label_tag
do
.preview.append-bottom-10
=
image_tag
"multi-editor-off.png"
.preview.append-bottom-10
=
image_tag
"multi-editor-off.png"
...
...
changelogs/unreleased/41789-fix-up-web-ide-user-preference-copy-and-buttons.yml
0 → 100644
View file @
407d5638
---
title
:
Fix web ide user preferences copy and buttons
merge_request
:
41789
author
:
type
:
other
spec/features/projects/tree/create_directory_spec.rb
View file @
407d5638
...
@@ -14,7 +14,7 @@ feature 'Multi-file editor new directory', :js do
...
@@ -14,7 +14,7 @@ feature 'Multi-file editor new directory', :js do
wait_for_requests
wait_for_requests
click_link
(
'
Multi Edit
'
)
click_link
(
'
Web IDE
'
)
wait_for_requests
wait_for_requests
end
end
...
...
spec/features/projects/tree/create_file_spec.rb
View file @
407d5638
...
@@ -14,7 +14,7 @@ feature 'Multi-file editor new file', :js do
...
@@ -14,7 +14,7 @@ feature 'Multi-file editor new file', :js do
wait_for_requests
wait_for_requests
click_link
(
'
Multi Edit
'
)
click_link
(
'
Web IDE
'
)
wait_for_requests
wait_for_requests
end
end
...
...
spec/features/projects/tree/upload_file_spec.rb
View file @
407d5638
...
@@ -16,7 +16,7 @@ feature 'Multi-file editor upload file', :js do
...
@@ -16,7 +16,7 @@ feature 'Multi-file editor upload file', :js do
wait_for_requests
wait_for_requests
click_link
(
'
Multi Edit
'
)
click_link
(
'
Web IDE
'
)
wait_for_requests
wait_for_requests
end
end
...
...
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