diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2018-09-08 10:36:45 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2019-01-31 13:49:50 +0100 |
| commit | 82f09a91dd3abae48b74010f541ea50e0190276a (patch) | |
| tree | 509c57f9f9611ed7e5c0ade54b31d87409fc5272 /app | |
| parent | f17d10c451138f801176e2bde3f8bc9ba31823e9 (diff) | |
| download | gitlab-ce-82f09a91dd3abae48b74010f541ea50e0190276a.tar.gz | |
Incorporate feedback from Nick
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/group_label.rb | 4 | ||||
| -rw-r--r-- | app/services/labels/update_service.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/models/group_label.rb b/app/models/group_label.rb index ff14529c6e6..d1499129130 100644 --- a/app/models/group_label.rb +++ b/app/models/group_label.rb @@ -10,4 +10,8 @@ class GroupLabel < Label def subject_foreign_key 'group_id' end + + def priority(parent) + nil + end end diff --git a/app/services/labels/update_service.rb b/app/services/labels/update_service.rb index e563447c64c..be33947d0eb 100644 --- a/app/services/labels/update_service.rb +++ b/app/services/labels/update_service.rb @@ -8,6 +8,7 @@ module Labels # returns the updated label def execute(label) + params[:name] = params.delete(:new_name) if params.key?(:new_name) params[:color] = convert_color_name_to_hex if params[:color].present? label.update(params) |