Download as
Browse Code »

Commit dad576a7771678ac4caf455272e03d2c779298ee

Authored by Dmitriy Zaporozhets
2 parents afd747d4 bb0a47d4
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Showing 2 changed files with 2 additions and 5 deletions   Show diff stats
app/models/issue.rb
  Diff comments   View file @dad576a
@@ -28,7 +28,7 @@ class Issue < ActiveRecord::Base @@ -28,7 +28,7 @@ class Issue < ActiveRecord::Base
28 28
29 scope :of_group, ->(group) { where(project_id: group.project_ids) } 29 scope :of_group, ->(group) { where(project_id: group.project_ids) }
30 scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) } 30 scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) }
31 - scope :opened, -> { with_state(:opened) } 31 + scope :opened, -> { with_state(:opened, :reopened) }
32 scope :closed, -> { with_state(:closed) } 32 scope :closed, -> { with_state(:closed) }
33 33
34 attr_accessible :title, :assignee_id, :position, :description, 34 attr_accessible :title, :assignee_id, :position, :description,
@@ -56,9 +56,6 @@ class Issue < ActiveRecord::Base @@ -56,9 +56,6 @@ class Issue < ActiveRecord::Base
56 state :closed 56 state :closed
57 end 57 end
58 58
59 - # Both open and reopened issues should be listed as opened  
60 - scope :opened, -> { with_state(:opened, :reopened) }  
61 -  
62 # Mentionable overrides. 59 # Mentionable overrides.
63 60
64 def gfm_reference 61 def gfm_reference
app/views/snippets/_form.html.haml
  Diff comments   View file @dad576a
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 = f.radio_button :private, false 25 = f.radio_button :private, false
26 %span 26 %span
27 %strong Public 27 %strong Public
28 - (GitLab users can can see this snippet) 28 + (GitLab users can see this snippet)
29 29
30 .control-group 30 .control-group
31 .file-editor 31 .file-editor