diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-11-22 17:15:46 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-11-22 23:30:51 +0800 |
| commit | 418947b6ce3da1c62b6449c4782d3e979eb82a07 (patch) | |
| tree | 17a0e137da869d01d577190644a91ddbd80c27a0 /app | |
| parent | 663593e87e81d199a5b9a4926d4644ed15416ab0 (diff) | |
| download | gitlab-ce-418947b6ce3da1c62b6449c4782d3e979eb82a07.tar.gz | |
Fix a few layout error
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 2 | ||||
| -rw-r--r-- | app/controllers/concerns/milestone_actions.rb | 1 | ||||
| -rw-r--r-- | app/models/concerns/time_trackable.rb | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index a725aad43e7..6c503bc8e55 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -98,7 +98,7 @@ module IssuableActions end def labels - @labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute # rubocop:disable Gitlab/ModuleWithInstanceVariables + @labels ||= LabelsFinder.new(current_user, project_id: @project.id).execute # rubocop:disable Gitlab/ModuleWithInstanceVariables end def authorize_destroy_issuable! diff --git a/app/controllers/concerns/milestone_actions.rb b/app/controllers/concerns/milestone_actions.rb index 7bec64c5d60..d92cf8b4894 100644 --- a/app/controllers/concerns/milestone_actions.rb +++ b/app/controllers/concerns/milestone_actions.rb @@ -30,7 +30,6 @@ module MilestoneActions format.json do render json: tabs_json("shared/milestones/_labels_tab", { labels: @milestone.labels # rubocop:disable Gitlab/ModuleWithInstanceVariables - }) end end diff --git a/app/models/concerns/time_trackable.rb b/app/models/concerns/time_trackable.rb index fc44a7da178..89fe6527647 100644 --- a/app/models/concerns/time_trackable.rb +++ b/app/models/concerns/time_trackable.rb @@ -4,6 +4,7 @@ # # Used by Issue and MergeRequest. # + module TimeTrackable extend ActiveSupport::Concern |