diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-02-27 09:43:53 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-02-27 09:43:53 +0000 |
| commit | 079d471e8effe0e3b200cc7023dc81c0d155293a (patch) | |
| tree | e67d19918870ab6ecaa53531411ef344d979e6f3 /app/helpers | |
| parent | 2dcbc0fa5657ab5c4ed46c5c84b8674faec36ea8 (diff) | |
| parent | e9b28a28a7494500f0295b87cf9f3389d48a8c30 (diff) | |
| download | gitlab-ce-079d471e8effe0e3b200cc7023dc81c0d155293a.tar.gz | |
Merge branch 'web-ide-default-editor' into 'master'
Makes the Web IDE the default editor
Closes #42382
See merge request gitlab-org/gitlab-ce!25171
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/blob_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 23d6684a8e6..06beeebe2ba 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -31,12 +31,13 @@ module BlobHelper edit_button_tag(blob, common_classes, _('Edit'), - edit_blob_path(project, ref, path, options), + Feature.enabled?(:web_ide_default) ? ide_edit_path(project, ref, path, options) : edit_blob_path(project, ref, path, options), project, ref) end def ide_edit_button(project = @project, ref = @ref, path = @path, options = {}) + return unless Feature.enabled?(:web_ide_default) return unless blob = readable_blob(options, path, project, ref) edit_button_tag(blob, |