diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-25 13:57:22 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-25 13:57:22 +0200 |
| commit | 7ec89692858a207691489aed566af7785a923895 (patch) | |
| tree | dfad4c6ea77f322b68db974102c5ec54fe0366f6 /app/controllers/projects/environments_controller.rb | |
| parent | 2f62af684e127010cffd81e027f469dcde3bc9b2 (diff) | |
| parent | 78de1c059ac588df4ba1ef352b28e5b1c6102804 (diff) | |
| download | gitlab-ce-7ec89692858a207691489aed566af7785a923895.tar.gz | |
Merge branch 'master' into zj-realtime-env-list
Diffstat (limited to 'app/controllers/projects/environments_controller.rb')
| -rw-r--r-- | app/controllers/projects/environments_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index d85bf44ae4d..4630f451445 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -33,6 +33,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 |