diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-18 14:40:37 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-18 14:40:37 +0200 |
| commit | dad576a7771678ac4caf455272e03d2c779298ee (patch) | |
| tree | 7e27930c9a5c9f8a51243f8278db588b04f5c137 | |
| parent | afd747d4d7af9e4f5387927bcaa709a2d3fefbef (diff) | |
| parent | bb0a47d410347f1ab7c5c30b8e6222354baee349 (diff) | |
| download | gitlab-ce-dad576a7771678ac4caf455272e03d2c779298ee.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | app/models/issue.rb | 5 | ||||
| -rw-r--r-- | app/views/snippets/_form.html.haml | 2 |
2 files changed, 2 insertions, 5 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 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 |