Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/environments/components/environments_app.vue

@@ -106,9 +106,9 @@ export default {
       <tabs :tabs="tabs" scope="environments" @onChangeTab="onChangeTab" />
 
       <div v-if="canCreateEnvironment && !isLoading" class="nav-controls">
-        <a :href="newEnvironmentPath" class="btn btn-success">
-          {{ s__('Environments|New environment') }}
-        </a>
+        <a :href="newEnvironmentPath" class="btn btn-success">{{
+          s__('Environments|New environment')
+        }}</a>
       </div>
     </div>
 

app/assets/javascripts/environments/components/environments_table.vue

@@ -103,9 +103,9 @@ export default {
 
           <div :key="`sub-div-${i}`">
             <div class="text-center prepend-top-10">
-              <a :href="folderUrl(model)" class="btn btn-default">
-                {{ s__('Environments|Show all') }}
-              </a>
+              <a :href="folderUrl(model)" class="btn btn-default">{{
+                s__('Environments|Show all')
+              }}</a>
             </div>
           </div>
         </template>

app/assets/javascripts/environments/folder/environments_folder_bundle.js

@@ -15,11 +15,11 @@ export default () =>
       const environmentsData = document.querySelector(this.$options.el).dataset;
 
       return {
-        endpoint: environmentsData.endpoint,
-        folderName: environmentsData.folderName,
+        endpoint: environmentsData.environmentsDataEndpoint,
+        folderName: environmentsData.environmentsDataFolderName,
         cssContainerClass: environmentsData.cssClass,
-        canCreateDeployment: parseBoolean(environmentsData.canCreateDeployment),
-        canReadEnvironment: parseBoolean(environmentsData.canReadEnvironment),
+        canCreateDeployment: parseBoolean(environmentsData.environmentsDataCanCreateDeployment),
+        canReadEnvironment: parseBoolean(environmentsData.environmentsDataCanReadEnvironment),
       };
     },
     render(createElement) {

app/helpers/environments_helper.rb

@@ -9,6 +9,15 @@ module EnvironmentsHelper
     }
   end
 
+  def environments_folder_list_view_data
+    {
+      "endpoint" => folder_project_environments_path(@project, @folder, format: :json),
+      "folder-name" => @folder,
+      "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s,
+      "can-read-environment" => can?(current_user, :read_environment, @project).to_s
+    }
+  end
+
   def metrics_data(project, environment)
     {
       "settings-path" => edit_project_service_path(project, 'prometheus'),

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

 - @no_container = true
 - page_title _("Environments")
 
-#environments-folder-list-view{ data: { endpoint: folder_project_environments_path(@project, @folder, format: :json),
-  "folder-name" => @folder,
-  "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s,
-  "can-read-environment" => can?(current_user, :read_environment, @project).to_s,
+#environments-folder-list-view{ data: { environments_data: environments_folder_list_view_data,
   "css-class" => container_class } }
 

db/fixtures/development/10_merge_requests.rb

@@ -27,6 +27,9 @@ Gitlab::Seeder.quiet do
 
       Sidekiq::Worker.skipping_transaction_check do
         MergeRequests::CreateService.new(project, developer, params).execute
+      rescue Repository::AmbiguousRefError
+        # Ignore pipelines creation errors for now, we can doing that after
+        # https://gitlab.com/gitlab-org/gitlab-ce/issues/55966. will be resolved.
       end
       print '.'
     end