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
d6d1340a
Commit
d6d1340a
authored
Jan 15, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IDE is now EEU
parent
04fdd455
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
36 additions
and
5 deletions
+36
-5
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+2
-2
app/helpers/blob_helper.rb
app/helpers/blob_helper.rb
+1
-1
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+2
-0
app/views/projects/tree/_tree_header.html.haml
app/views/projects/tree/_tree_header.html.haml
+1
-1
app/views/shared/_ref_switcher.html.haml
app/views/shared/_ref_switcher.html.haml
+1
-1
ee/app/models/license.rb
ee/app/models/license.rb
+1
-0
ee/app/views/profiles/preferences/_ide.html.haml
ee/app/views/profiles/preferences/_ide.html.haml
+20
-0
spec/features/profiles/user_visits_profile_preferences_page_spec.rb
...res/profiles/user_visits_profile_preferences_page_spec.rb
+2
-0
spec/features/projects/tree/create_directory_spec.rb
spec/features/projects/tree/create_directory_spec.rb
+2
-0
spec/features/projects/tree/create_file_spec.rb
spec/features/projects/tree/create_file_spec.rb
+2
-0
spec/features/projects/tree/upload_file_spec.rb
spec/features/projects/tree/upload_file_spec.rb
+2
-0
No files found.
app/helpers/application_helper.rb
View file @
d6d1340a
...
...
@@ -310,8 +310,8 @@ module ApplicationHelper
cookies
[
"sidebar_collapsed"
]
==
"true"
end
def
show_new_ide?
cookies
[
"new_repo"
]
==
"true"
&&
body_data_page
!=
'projects:show'
def
show_new_ide?
(
project
)
cookies
[
"new_repo"
]
==
"true"
&&
body_data_page
!=
'projects:show'
&&
project
.
feature_available?
(
:ide
)
end
def
locale_path
...
...
app/helpers/blob_helper.rb
View file @
d6d1340a
...
...
@@ -52,7 +52,7 @@ module BlobHelper
end
def
ide_blob_link
(
project
=
@project
,
ref
=
@ref
,
path
=
@path
,
options
=
{})
return
unless
show_new_ide?
return
unless
show_new_ide?
(
@project
)
blob
=
options
.
delete
(
:blob
)
blob
||=
project
.
repository
.
blob_at
(
ref
,
path
)
rescue
nil
...
...
app/views/profiles/preferences/show.html.haml
View file @
d6d1340a
...
...
@@ -3,6 +3,8 @@
=
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
|
=
render
"profiles/preferences/ide"
,
f:
f
.col-lg-4.application-theme
%h4
.prepend-top-0
GitLab navigation theme
...
...
app/views/projects/tree/_tree_header.html.haml
View file @
d6d1340a
...
...
@@ -68,7 +68,7 @@
#{
_
(
'New tag'
)
}
.tree-controls
-
if
show_new_ide?
-
if
show_new_ide?
(
@project
)
=
succeed
" "
do
=
link_to
ide_edit_path
(
@project
,
@id
),
class:
'btn btn-default'
do
=
ide_edit_text
...
...
app/views/shared/_ref_switcher.html.haml
View file @
d6d1340a
-
show_create
=
local_assigns
.
fetch
(
:show_create
,
false
)
-
show_new_branch_form
=
show_new_ide?
&&
show_create
&&
can?
(
current_user
,
:push_code
,
@project
)
-
show_new_branch_form
=
show_new_ide?
(
@project
)
&&
show_create
&&
can?
(
current_user
,
:push_code
,
@project
)
-
dropdown_toggle_text
=
@ref
||
@project
.
default_branch
=
form_tag
switch_project_refs_path
(
@project
),
method: :get
,
class:
"project-refs-form"
do
=
hidden_field_tag
:destination
,
destination
...
...
ee/app/models/license.rb
View file @
d6d1340a
...
...
@@ -57,6 +57,7 @@ class License < ActiveRecord::Base
sast_container
dast
epics
ide
]
.
freeze
# List all features available for early adopters,
...
...
ee/app/views/profiles/preferences/_ide.html.haml
0 → 100644
View file @
d6d1340a
-
if
License
.
feature_available?
(
:ide
)
.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.
-
if
current_application_settings
.
should_check_namespace_plan?
Available for public GitLab.com projects or those using Gold.
.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
spec/features/profiles/user_visits_profile_preferences_page_spec.rb
View file @
d6d1340a
...
...
@@ -4,6 +4,8 @@ describe 'User visits the profile preferences page' do
let
(
:user
)
{
create
(
:user
)
}
before
do
stub_licensed_features
(
ide:
true
)
sign_in
(
user
)
visit
(
profile_preferences_path
)
...
...
spec/features/projects/tree/create_directory_spec.rb
View file @
d6d1340a
...
...
@@ -5,6 +5,8 @@ feature 'Multi-file editor new directory', :js do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
before
do
stub_licensed_features
(
ide:
true
)
project
.
add_master
(
user
)
sign_in
(
user
)
...
...
spec/features/projects/tree/create_file_spec.rb
View file @
d6d1340a
...
...
@@ -5,6 +5,8 @@ feature 'Multi-file editor new file', :js do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
before
do
stub_licensed_features
(
ide:
true
)
project
.
add_master
(
user
)
sign_in
(
user
)
...
...
spec/features/projects/tree/upload_file_spec.rb
View file @
d6d1340a
...
...
@@ -7,6 +7,8 @@ feature 'Multi-file editor upload file', :js do
let
(
:img_file
)
{
File
.
join
(
Rails
.
root
,
'spec'
,
'fixtures'
,
'dk.png'
)
}
before
do
stub_licensed_features
(
ide:
true
)
project
.
add_master
(
user
)
sign_in
(
user
)
...
...
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