Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/diffs/components/app.vue

@@ -64,6 +64,11 @@ export default {
       required: false,
       default: '',
     },
+    isFluidLayout: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     const treeWidth =
@@ -116,7 +121,7 @@ export default {
       return this.treeWidth <= TREE_HIDE_STATS_WIDTH;
     },
     isLimitedContainer() {
-      return !this.showTreeList && !this.isParallelView;
+      return !this.showTreeList && !this.isParallelView && !this.isFluidLayout;
     },
   },
   watch: {

app/assets/javascripts/diffs/index.js

@@ -71,6 +71,7 @@ export default function initDiffsApp(store) {
         helpPagePath: dataset.helpPagePath,
         currentUser: JSON.parse(dataset.currentUserData) || {},
         changesEmptyStateIllustration: dataset.changesEmptyStateIllustration,
+        isFluidLayout: parseBoolean(dataset.isFluidLayout),
       };
     },
     computed: {
@@ -97,6 +98,7 @@ export default function initDiffsApp(store) {
           helpPagePath: this.helpPagePath,
           shouldShow: this.activeTab === 'diffs',
           changesEmptyStateIllustration: this.changesEmptyStateIllustration,
+          isFluidLayout: this.isFluidLayout,
         },
       });
     },

app/views/projects/deployments/_actions.haml

@@ -10,5 +10,5 @@
           - actions.each do |action|
             - next unless can?(current_user, :update_build, action)
             %li
-              = link_to [:play, @project.namespace.becomes(Namespace), @project, action], method: :post, rel: 'nofollow', class: 'btn' do
+              = link_to [:play, @project.namespace.becomes(Namespace), @project, action], method: :post, rel: 'nofollow' do
                 %span= action.name

app/views/projects/environments/_form.html.haml

@@ -17,5 +17,5 @@
       = f.url_field :external_url, class: 'form-control'
 
     .form-actions
-      = f.submit _('Save'), class: 'btn btn-save'
+      = f.submit _('Save'), class: 'btn btn-success'
       = link_to _('Cancel'), project_environments_path(@project), class: 'btn btn-cancel'

app/views/projects/merge_requests/show.html.haml

@@ -82,7 +82,8 @@
         help_page_path: suggest_changes_help_path,
         current_user_data: UserSerializer.new(project: @project).represent(current_user, {}, MergeRequestUserEntity).to_json,
         project_path: project_path(@merge_request.project),
-        changes_empty_state_illustration: image_path('illustrations/merge_request_changes_empty.svg') } }
+        changes_empty_state_illustration: image_path('illustrations/merge_request_changes_empty.svg'),
+        is_fluid_layout: fluid_layout.to_s } }
 
     .mr-loading-status
       = spinner

changelogs/unreleased/60224-btn-env.yml

+---
+title: Fixes actions dropdowns in environments page
+merge_request: 27160
+author:
+type: fixed

changelogs/unreleased/60261-save-btn-env.yml

+---
+title: Fixes create button background for Environments form
+merge_request: 27161
+author:
+type: fixed

spec/javascripts/diffs/components/app_spec.js

@@ -75,6 +75,14 @@ describe('diffs/components/app', () => {
     expect(wrapper.contains('.container-limited.limit-container-width')).toBe(false);
   });
 
+  it('does not add container-limiting classes when isFluidLayout', () => {
+    createComponent({ isFluidLayout: true }, ({ state }) => {
+      state.diffs.isParallelView = false;
+    });
+
+    expect(wrapper.contains('.container-limited.limit-container-width')).toBe(false);
+  });
+
   it('displays loading icon on loading', () => {
     createComponent({}, ({ state }) => {
       state.diffs.isLoading = true;