diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-17 10:40:54 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-18 15:18:06 +0000 |
| commit | a45cb688095eda294b0242a09d28168d4e279421 (patch) | |
| tree | 19b24e851a2709273f6695fcf009e368bc2c45c3 /app/helpers/labels_helper.rb | |
| parent | 0eecc214853fc07b9237b50ab65a6c702cbfaeb4 (diff) | |
| download | gitlab-ce-a45cb688095eda294b0242a09d28168d4e279421.tar.gz | |
Fixed failing tests
Diffstat (limited to 'app/helpers/labels_helper.rb')
| -rw-r--r-- | app/helpers/labels_helper.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index 361811163f9..49f701e9bee 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -110,12 +110,11 @@ module LabelsHelper end def projects_labels_options - labels = - if @project - @project.labels - else - Label.where(project_id: @projects) - end + if @project + @project.labels + else + Label.where(project_id: @projects) + end end def labels_filter_path |