summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-08-04 14:10:36 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-08-04 14:10:36 +0100
commit03598ca79b02a949b1d6cc1e64a701be2b65581f (patch)
tree6d067dd55b78e2c6ea844e1f200f8bf2e7e97cb8
parent91a60743489f67766f1e06da56efa172fedaca89 (diff)
downloadgitlab-ce-03598ca79b02a949b1d6cc1e64a701be2b65581f.tar.gz
Disable new repo on project show
-rw-r--r--app/assets/javascripts/dispatcher.js2
-rw-r--r--app/helpers/application_helper.rb2
-rw-r--r--app/views/projects/show.html.haml5
3 files changed, 1 insertions, 8 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 8f10afd7a2f..eedcce877ba 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -349,8 +349,6 @@ import FeatureHelper from './helpers/feature_helper';
shortcut_handler = new ShortcutsNavigation();
new NotificationsForm();
- if (FeatureHelper.isNewRepo()) break;
-
if ($('#tree-slider').length) new TreeView();
if ($('.blob-viewer').length) new BlobViewer();
break;
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 44dacff5997..22f637946d9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -307,6 +307,6 @@ module ApplicationHelper
end
def show_new_repo?
- cookies["new_repo"] == "true"
+ cookies["new_repo"] == "true" && body_data_page != 'projects:show'
end
end
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 370516ca55e..a9b39cedb1d 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -5,11 +5,6 @@
= content_for :meta_tags do
= auto_discovery_link_tag(:atom, project_path(@project, rss_url_options), title: "#{@project.name} activity")
-- if show_new_repo?
- - content_for :page_specific_javascripts do
- = webpack_bundle_tag 'common_vue'
- = webpack_bundle_tag 'repo'
-
= render partial: 'flash_messages', locals: { project: @project }
= render "projects/head"