summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-05-17 13:36:19 +0200
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-05-17 13:45:11 +0200
commit0385f9efc2a7844b0900958281296eb444b5070c (patch)
tree8d8c753de4a73202841574af5085fff6164b32ba /app/controllers
parent6a2bcb4b2ae8bed4730f3589c2693b17c57b4a75 (diff)
downloadgitlab-ce-0385f9efc2a7844b0900958281296eb444b5070c.tar.gz
Sort environments folders when opening them
Fixes gitlab-org/gitlab-ce#30814
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/environments_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index fd57afbd05f..efe83776834 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -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