diff options
author | Thiago Presa <tpresa@gitlab.com> | 2018-11-04 21:09:03 -0200 |
---|---|---|
committer | Thiago Presa <tpresa@gitlab.com> | 2018-11-04 21:09:03 -0200 |
commit | 5ffc5d66786b1a9e1f9cc2c8a562142be0b3cec4 (patch) | |
tree | 041a31fff9178e02439482bca2a0c0f7f407987a | |
parent | 2e8fd64ba68c310e9aa387531d1dc65184a80135 (diff) | |
parent | 391f80df9e4cd4cb76719382cad0b3ce6c51fade (diff) | |
download | gitlab-ce-5ffc5d66786b1a9e1f9cc2c8a562142be0b3cec4.tar.gz |
Merge branch '11-4-stable-patch-5' into 11-4-stable
5 files changed, 20 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 78f56ab57ff..3e11b059b63 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -421,7 +421,7 @@ export default class MergeRequestTabs { if (this.diffViewType() === 'parallel' || removeLimited) { $wrapper.removeClass('container-limited'); } else { - $wrapper.addClass('container-limited'); + $wrapper.toggleClass('container-limited', this.fixedLayoutPref); } } diff --git a/app/views/instance_statistics/conversational_development_index/_disabled.html.haml b/app/views/instance_statistics/conversational_development_index/_disabled.html.haml index 0a5717f75e1..b854e15d36f 100644 --- a/app/views/instance_statistics/conversational_development_index/_disabled.html.haml +++ b/app/views/instance_statistics/conversational_development_index/_disabled.html.haml @@ -11,4 +11,4 @@ %p = _('Enable usage ping to get an overview of how you are using GitLab from a feature perspective.') - if current_user.admin? - = link_to _('Enable usage ping'), admin_application_settings_path(anchor: 'usage-statistics'), class: 'btn btn-primary' + = link_to _('Enable usage ping'), metrics_and_profiling_admin_application_settings_path(anchor: 'js-usage-settings'), class: 'btn btn-primary' diff --git a/changelogs/unreleased/53070-fix-enable-usage-ping-link.yml b/changelogs/unreleased/53070-fix-enable-usage-ping-link.yml new file mode 100644 index 00000000000..605d3679159 --- /dev/null +++ b/changelogs/unreleased/53070-fix-enable-usage-ping-link.yml @@ -0,0 +1,5 @@ +--- +title: "fix link to enable usage ping from convdev index" +merge_request: 22545 +author: Anand Capur +type: fixed diff --git a/changelogs/unreleased/mr-file-tree-inline-fluid-width-fix.yml b/changelogs/unreleased/mr-file-tree-inline-fluid-width-fix.yml new file mode 100644 index 00000000000..b61f47724fc --- /dev/null +++ b/changelogs/unreleased/mr-file-tree-inline-fluid-width-fix.yml @@ -0,0 +1,5 @@ +--- +title: Fixed merge request fill tree toggling not respecting fluid width preference +merge_request: +author: +type: fixed diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js index 7251ce19a90..7714197c821 100644 --- a/spec/javascripts/merge_request_tabs_spec.js +++ b/spec/javascripts/merge_request_tabs_spec.js @@ -224,6 +224,14 @@ describe('MergeRequestTabs', function() { expect($('.content-wrapper')).not.toContainElement('.container-limited'); }); + it('does not add container-limited when fluid layout is prefered', function() { + $('.content-wrapper .container-fluid').removeClass('container-limited'); + + this.class.expandViewContainer(false); + + expect($('.content-wrapper')).not.toContainElement('.container-limited'); + }); + it('does remove container-limited from breadcrumbs', function() { $('.container-limited').addClass('breadcrumbs'); this.class.expandViewContainer(); |