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

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

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