From 1c2f22eb0b1f2005fda16e4708bbff82167c3d52 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 8 Aug 2017 09:14:00 -0500 Subject: Revert "Combine 'turn on/off' user dropdown links into 'experimental features' link and andded 'experimental features' heading for user preferences page" This reverts commit 75f490a4c95c41f9364e8e0cba443b312f01a686. --- app/views/layouts/header/_default.html.haml | 4 +++- app/views/layouts/header/_new.html.haml | 4 +++- app/views/profiles/preferences/show.html.haml | 2 -- app/views/shared/_user_dropdown_experimental_features.html.haml | 1 - app/views/shared/repo/_user_dropdown_link.html.haml | 1 + 5 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 app/views/shared/_user_dropdown_experimental_features.html.haml create mode 100644 app/views/shared/repo/_user_dropdown_link.html.haml diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index df1dc736571..c7aa97a351f 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -74,7 +74,9 @@ = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username } %li = link_to "Settings", profile_path - = render 'shared/user_dropdown_experimental_features' + %li + = link_to "Turn on new navigation", profile_preferences_path(anchor: "new-navigation") + = render 'shared/repo/user_dropdown_link' %li.divider %li = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link" diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml index fa94925d537..0734cdfc05e 100644 --- a/app/views/layouts/header/_new.html.haml +++ b/app/views/layouts/header/_new.html.haml @@ -68,7 +68,9 @@ = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username } %li = link_to "Settings", profile_path - = render 'shared/user_dropdown_experimental_features' + %li + = link_to "Turn off new navigation", profile_preferences_path(anchor: "new-navigation") + = render 'shared/repo/user_dropdown_link' %li.divider %li = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link" diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 9bd8bf91d1c..084af0629ae 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -18,8 +18,6 @@ = scheme.name .col-sm-12 %hr - %h3#experimental-features Experimental features - %hr .col-lg-4.profile-settings-sidebar#new-navigation %h4.prepend-top-0 New Navigation diff --git a/app/views/shared/_user_dropdown_experimental_features.html.haml b/app/views/shared/_user_dropdown_experimental_features.html.haml deleted file mode 100644 index 8e71407b748..00000000000 --- a/app/views/shared/_user_dropdown_experimental_features.html.haml +++ /dev/null @@ -1 +0,0 @@ -%li= link_to 'Experimental features', profile_preferences_path(anchor: 'experimental-features') diff --git a/app/views/shared/repo/_user_dropdown_link.html.haml b/app/views/shared/repo/_user_dropdown_link.html.haml new file mode 100644 index 00000000000..bddd83a123d --- /dev/null +++ b/app/views/shared/repo/_user_dropdown_link.html.haml @@ -0,0 +1 @@ +%li= link_to "Turn #{show_new_repo? ? 'off' : 'on'} new repository", profile_preferences_path(anchor: "new-repository") -- cgit v1.2.1 From b0127c3f6a39ae48e54fafcac2caf799dae90ab5 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 8 Aug 2017 09:15:24 -0500 Subject: hide the feature flag for the repo editor feature --- app/views/profiles/preferences/show.html.haml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 084af0629ae..f08dcc0c242 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -40,28 +40,6 @@ New .col-sm-12 %hr - .col-lg-4.profile-settings-sidebar#new-repository - %h4.prepend-top-0 - New Repository - %p - This setting allows you to turn on or off the new upcoming repository concept. - .col-lg-8.syntax-theme - .nav-wip - %p - The new repository is currently a work-in-progress concept and only usable on wide-screens. There are a number of improvements that we are working on in order to further refine the repository view. - %p - %a{ href: 'https://gitlab.com/gitlab-org/gitlab-ce/issues/31890', target: 'blank' } Learn more - about the improvements that are coming soon! - = label_tag do - .preview= image_tag "old_repo.png" - %input.js-experiment-feature-toggle{ type: "radio", value: "false", name: "new_repo", checked: !show_new_repo? } - Old - = label_tag do - .preview= image_tag "new_repo.png" - %input.js-experiment-feature-toggle{ type: "radio", value: "true", name: "new_repo", checked: show_new_repo? } - New - .col-sm-12 - %hr .col-lg-4.profile-settings-sidebar %h4.prepend-top-0 Behavior -- cgit v1.2.1 From 0b9e9ffc5ac34f014fe2fe82c2a759cc83c7dd21 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 8 Aug 2017 09:26:55 -0500 Subject: Revert "Add user_dropdown_link to prompt users to turn on new repo" This reverts commit 79f94c8d221f9391f48899808b7a36e3905dab83. --- app/views/layouts/header/_default.html.haml | 1 - app/views/layouts/header/_new.html.haml | 1 - app/views/shared/repo/_user_dropdown_link.html.haml | 1 - 3 files changed, 3 deletions(-) delete mode 100644 app/views/shared/repo/_user_dropdown_link.html.haml diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index c7aa97a351f..b32cfe158bb 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -76,7 +76,6 @@ = link_to "Settings", profile_path %li = link_to "Turn on new navigation", profile_preferences_path(anchor: "new-navigation") - = render 'shared/repo/user_dropdown_link' %li.divider %li = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link" diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml index 0734cdfc05e..2c1c23d6ea9 100644 --- a/app/views/layouts/header/_new.html.haml +++ b/app/views/layouts/header/_new.html.haml @@ -70,7 +70,6 @@ = link_to "Settings", profile_path %li = link_to "Turn off new navigation", profile_preferences_path(anchor: "new-navigation") - = render 'shared/repo/user_dropdown_link' %li.divider %li = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link" diff --git a/app/views/shared/repo/_user_dropdown_link.html.haml b/app/views/shared/repo/_user_dropdown_link.html.haml deleted file mode 100644 index bddd83a123d..00000000000 --- a/app/views/shared/repo/_user_dropdown_link.html.haml +++ /dev/null @@ -1 +0,0 @@ -%li= link_to "Turn #{show_new_repo? ? 'off' : 'on'} new repository", profile_preferences_path(anchor: "new-repository") -- cgit v1.2.1