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
a003e123
Commit
a003e123
authored
Jan 18, 2018
by
Tim Zallmann
Committed by
Luke Bennett
Jan 18, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'remove-ide-pref' into 'master'
Remove IDE option from user preferences See merge request gitlab-org/gitlab-ce!16454 (cherry picked from commit
e56bcf92
)
af79397f
Remove IDE option from user preferences
18abb303
remove specs
parent
8c4ed4b3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
29 deletions
+0
-29
show.html.haml
app/views/profiles/preferences/show.html.haml
+0
-17
user_visits_profile_preferences_page_spec.rb
...res/profiles/user_visits_profile_preferences_page_spec.rb
+0
-12
No files found.
app/views/profiles/preferences/show.html.haml
View file @
a003e123
...
...
@@ -3,23 +3,6 @@
=
render
'profiles/head'
=
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
%h4
.prepend-top-0
Web IDE (Beta)
%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
=
label_tag
do
.preview.append-bottom-10
=
image_tag
"multi-editor-off.png"
=
f
.
radio_button
:multi_file
,
"off"
,
checked:
true
Off
=
label_tag
do
.preview.append-bottom-10
=
image_tag
"multi-editor-on.png"
=
f
.
radio_button
:multi_file
,
"on"
,
checked:
false
On
.col-sm-12
%hr
.col-lg-4.application-theme
%h4
.prepend-top-0
GitLab navigation theme
...
...
spec/features/profiles/user_visits_profile_preferences_page_spec.rb
View file @
a003e123
...
...
@@ -32,18 +32,6 @@ describe 'User visits the profile preferences page' do
end
end
describe
'User changes their multi file editor preferences'
,
:js
do
it
'set the new_repo cookie when the option is ON'
do
choose
'user_multi_file_on'
expect
(
get_cookie
(
'new_repo'
)).
not_to
be_nil
end
it
'deletes the new_repo cookie when the option is OFF'
do
choose
'user_multi_file_off'
expect
(
get_cookie
(
'new_repo'
)).
to
be_nil
end
end
describe
'User changes their default dashboard'
,
:js
do
it
'creates a flash message'
do
select
'Starred Projects'
,
from:
'user_dashboard'
...
...
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