Removed feature: comments on wiki

Dmitriy Zaporozhets
1 parent df03275e
Showing 7 changed files with 1 additions and 59 deletions Show diff stats
app/contexts/notes/load_context.rb
app/mailers/notify.rb
app/models/project.rb
app/views/notify/note_wiki_email.html.haml
app/views/wikis/show.html.haml
features/project/wiki.feature
spec/requests/gitlab_flavored_markdown_spec.rb
@@ -19,8 +19,6 @@ module Notes
                when "wall"
                  # this is the only case, where the order is DESC
                  project.common_notes.order("created_at DESC, id DESC").limit(50)
-               when "wiki"
-                 project.wiki_notes.limit(20)
                end
  
       @notes = if after_id
@@ -89,14 +89,6 @@ class Notify &lt; ActionMailer::Base
     mail(to: recipient(recipient_id), subject: subject)
   end
  
-  def note_wiki_email(recipient_id, note_id)
-    @note = Note.find(note_id)
-    @wiki = @note.noteable
-    @project = @note.project
-    mail(to: recipient(recipient_id), subject: subject("note for wiki"))
-  end
-
-
  
   #
   # Project
@@ -105,7 +97,7 @@ class Notify &lt; ActionMailer::Base
   def project_access_granted_email(user_project_id)
     @users_project = UsersProject.find user_project_id
     @project = @users_project.project
-    mail(to: @users_project.user.email, 
+    mail(to: @users_project.user.email,
          subject: subject("access to project was granted"))
   end
  
@@ -216,10 +216,6 @@ class Project &lt; ActiveRecord::Base
     last_event.try(:created_at) || updated_at
   end
  
-  def wiki_notes
-    Note.where(noteable_id: wikis.pluck(:id), noteable_type: 'Wiki', project_id: self.id)
-  end
-
   def project_id
     self.id
   end
@@ -1,23 +0,0 @@
-%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
-  %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
-    %tr
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{align: "left", style: "padding: 20px 0 0;"}
-        %h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
-          New comment for Wiki page
-          = link_to_gfm @wiki.title, project_wiki_url(@wiki.project, @wiki, anchor: "note_#{@note.id}")
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-    %tr
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-      %td{style: "padding: 15px 0 15px;", valign: "top"}
-        %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          %a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
-          commented on Wiki page:
-        %br
-          %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
-            %tr
-              %td{valign: "top"}
-                %div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
-                  = markdown(@note.note)
-      %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
-
@@ -19,6 +19,3 @@
 - if can? current_user, :admin_wiki, @project
   = link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete do
     Delete this page
-
-%hr
-.wiki_notes#notes= render "notes/notes_with_form", tid: @wiki.id, tt: "wiki"
@@ -7,9 +7,3 @@ Feature: Project Wiki
   Scenario: Add new page
     Given I create Wiki page
     Then I should see newly created wiki page
-
-  @javascript
-  Scenario: I comment wiki page
-    Given I create Wiki page
-    And I leave a comment like "XML attached"
-    Then I should see comment "XML attached"
@@ -197,18 +197,6 @@ describe &quot;Gitlab Flavored Markdown&quot; do
  
       page.should have_link("##{issue.id}")
     end
-
-    it "should render in wikis#index", js: true do
-      visit project_wiki_path(project, :index)
-      fill_in "Title", with: 'Test title'
-      fill_in "Content", with: '[link test](test)'
-      click_on "Save"
-
-      fill_in "note_note", with: "see ##{issue.id}"
-      click_button "Add Comment"
-
-      page.should have_link("##{issue.id}")
-    end
   end
...	...	@@ -19,8 +19,6 @@ module Notes
19	19	when "wall"
20	20	# this is the only case, where the order is DESC
21	21	project.common_notes.order("created_at DESC, id DESC").limit(50)
22		- when "wiki"
23		- project.wiki_notes.limit(20)
24	22	end
25	23
26	24	@notes = if after_id
...	...
...	...	@@ -89,14 +89,6 @@ class Notify < ActionMailer::Base
89	89	mail(to: recipient(recipient_id), subject: subject)
90	90	end
91	91
92		- def note_wiki_email(recipient_id, note_id)
93		- @note = Note.find(note_id)
94		- @wiki = @note.noteable
95		- @project = @note.project
96		- mail(to: recipient(recipient_id), subject: subject("note for wiki"))
97		- end
98		-
99		-
100	92
101	93	#
102	94	# Project
...	...	@@ -105,7 +97,7 @@ class Notify < ActionMailer::Base
105	97	def project_access_granted_email(user_project_id)
106	98	@users_project = UsersProject.find user_project_id
107	99	@project = @users_project.project
108		- mail(to: @users_project.user.email,
	100	+ mail(to: @users_project.user.email,
109	101	subject: subject("access to project was granted"))
110	102	end
111	103
...	...
...	...	@@ -216,10 +216,6 @@ class Project < ActiveRecord::Base
216	216	last_event.try(:created_at) \|\| updated_at
217	217	end
218	218
219		- def wiki_notes
220		- Note.where(noteable_id: wikis.pluck(:id), noteable_type: 'Wiki', project_id: self.id)
221		- end
222		-
223	219	def project_id
224	220	self.id
225	221	end
...	...
...	...	@@ -1,23 +0,0 @@
1		-%td.content{align: "left", style: "font-family: Helvetica, Arial, sans-serif; padding: 20px 0 0;", valign: "top", width: "600"}
2		- %table{border: "0", cellpadding: "0", cellspacing: "0", style: "color: #717171; font: normal 11px Helvetica, Arial, sans-serif; margin: 0; padding: 0;", width: "600"}
3		- %tr
4		- %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
5		- %td{align: "left", style: "padding: 20px 0 0;"}
6		- %h2{style: "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
7		- New comment for Wiki page
8		- = link_to_gfm @wiki.title, project_wiki_url(@wiki.project, @wiki, anchor: "note_#{@note.id}")
9		- %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
10		- %tr
11		- %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
12		- %td{style: "padding: 15px 0 15px;", valign: "top"}
13		- %p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
14		- %a{href: "#", style: "color: #0eb6ce; text-decoration: none;"} #{@note.author_name}
15		- commented on Wiki page:
16		- %br
17		- %table{border: "0", cellpadding: "0", cellspacing: "0", width: "558"}
18		- %tr
19		- %td{valign: "top"}
20		- %div{ style: "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
21		- = markdown(@note.note)
22		- %td{style: "font-size: 1px; line-height: 1px;", width: "21"}
23		-
...	...	@@ -19,6 +19,3 @@
19	19	- if can? current_user, :admin_wiki, @project
20	20	= link_to project_wiki_path(@project, @wiki), confirm: "Are you sure you want to delete this page?", method: :delete do
21	21	Delete this page
22		-
23		-%hr
24		-.wiki_notes#notes= render "notes/notes_with_form", tid: @wiki.id, tt: "wiki"
...	...
...	...	@@ -7,9 +7,3 @@ Feature: Project Wiki
7	7	Scenario: Add new page
8	8	Given I create Wiki page
9	9	Then I should see newly created wiki page
10		-
11		- @javascript
12		- Scenario: I comment wiki page
13		- Given I create Wiki page
14		- And I leave a comment like "XML attached"
15		- Then I should see comment "XML attached"
...	...
...	...	@@ -197,18 +197,6 @@ describe "Gitlab Flavored Markdown" do
197	197
198	198	page.should have_link("##{issue.id}")
199	199	end
200		-
201		- it "should render in wikis#index", js: true do
202		- visit project_wiki_path(project, :index)
203		- fill_in "Title", with: 'Test title'
204		- fill_in "Content", with: '[link test](test)'
205		- click_on "Save"
206		-
207		- fill_in "note_note", with: "see ##{issue.id}"
208		- click_button "Add Comment"
209		-
210		- page.should have_link("##{issue.id}")
211		- end
212	200	end
213	201
214	202
...	...