Skip to content
Snippets Groups Projects
Commit 65d3f48f authored by Z.J. van de Weg's avatar Z.J. van de Weg
Browse files

Sort environments folders when opening them

Fixes gitlab-org/gitlab-ce#30814


Former-commit-id: 0385f9efc2a7844b0900958281296eb444b5070c
parent ee4d1d0e
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -31,6 +31,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
def folder
folder_environments = project.environments.where(environment_type: params[:id])
@environments = folder_environments.with_state(params[:scope] || :available)
.order(:name)
 
respond_to do |format|
format.html
Loading
Loading
---
title: Sort folder for environments
merge_request:
author:
Loading
Loading
@@ -84,6 +84,9 @@ describe Projects::EnvironmentsController do
create(:environment, project: project,
name: 'staging-1.0/review',
state: :available)
create(:environment, project: project,
name: 'staging-1.0/preview',
state: :available)
end
 
context 'when using default format' do
Loading
Loading
@@ -107,6 +110,8 @@ describe Projects::EnvironmentsController do
expect(response).to be_ok
expect(response).not_to render_template 'folder'
expect(json_response['environments'][0])
.to include('name' => 'staging-1.0/preview')
expect(json_response['environments'][1])
.to include('name' => 'staging-1.0/review')
end
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment