diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-23 13:10:54 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-23 13:10:54 +0300 |
| commit | 35ab669a957dd63a5c662ba909f368380e3a60c7 (patch) | |
| tree | d41ea56ca8a0b08d657d63d1a0d404654232bf8a /app/controllers | |
| parent | d71577468cbf54bdd2621fac5f5a62f93193d4ea (diff) | |
| parent | 5c83d3aff2401aa134ec1bf23013ba9e47109b48 (diff) | |
Merge branch 'zj-sort-env-folders' into 'master'
Sort environments folders when opening them
Closes #30814
See merge request !11436
Diffstat (limited to 'app/controllers')
| -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 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 |