From 984eb08cbe15def95f1cfc2eff32fcb03eb3981b Mon Sep 17 00:00:00 2001 From: Alexey Elizarov Date: Tue, 17 Dec 2013 23:32:19 +0300 Subject: [PATCH 1/2] Duplicate opened scope for issue Was it correct? --- app/models/issue.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index b3609cf2f45..6580c5004af 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -28,7 +28,7 @@ class Issue < ActiveRecord::Base scope :of_group, ->(group) { where(project_id: group.project_ids) } scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) } - scope :opened, -> { with_state(:opened) } + scope :opened, -> { with_state(:opened, :reopened) } scope :closed, -> { with_state(:closed) } attr_accessible :title, :assignee_id, :position, :description, @@ -56,9 +56,6 @@ class Issue < ActiveRecord::Base state :closed end - # Both open and reopened issues should be listed as opened - scope :opened, -> { with_state(:opened, :reopened) } - # Mentionable overrides. def gfm_reference -- GitLab From ff0d8a18bf24f3d33fc63aab7af0e5b60de6f76b Mon Sep 17 00:00:00 2001 From: Hans Lemuet Date: Wed, 18 Dec 2013 00:04:40 +0100 Subject: [PATCH 2/2] tiny wording fix GitLab users can can see this snippet -> GitLab users can see this snippet --- app/views/snippets/_form.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml index 9da520e2a18..0541ed4d633 100644 --- a/app/views/snippets/_form.html.haml +++ b/app/views/snippets/_form.html.haml @@ -25,7 +25,7 @@ = f.radio_button :private, false %span %strong Public - (GitLab users can can see this snippet) + (GitLab users can see this snippet) .control-group .file-editor -- GitLab