Merge branch 'remove-wall'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG

Merge branch 'remove-wall'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
Dmitriy Zaporozhets
2 parents d3d0775a d593c98f
Showing 43 changed files with 7 additions and 530 deletions Show diff stats
CHANGELOG
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/wall.js.coffee
app/assets/stylesheets/sections/wall.scss
app/controllers/projects/walls_controller.rb
app/helpers/events_helper.rb
app/helpers/projects_helper.rb
app/helpers/search_helper.rb
app/mailers/emails/notes.rb
app/models/event.rb
app/models/note.rb
app/models/project.rb
app/observers/note_observer.rb
app/services/notification_service.rb
app/services/projects/create_service.rb
app/views/layouts/nav/_project.html.haml
app/views/notify/note_wall_email.html.haml
app/views/notify/note_wall_email.text.erb
app/views/projects/edit.html.haml
app/views/projects/walls/show.html.haml
@@ -34,6 +34,7 @@ v 7.0.0
   - Skip init script check on omnibus-gitlab
   - Be more selective when killing stray Sidekiqs
   - Check LDAP user filter during sign-in
+  - Remove wall feature (no data loss - you can take it from database)
  
 v 6.9.2
   - Revert the commit that broke the LDAP user filter
@@ -34,8 +34,6 @@ class Dispatcher
         new Activities()
       when 'projects:new', 'projects:edit'
         new Project()
-      when 'projects:walls:show'
-        new Wall(project_id)
       when 'projects:teams:members:index'
         new TeamMembers()
       when 'groups:members'
@@ -1,85 +0,0 @@
-class Wall
-  constructor: (project_id) ->
-    @project_id = project_id
-    @note_ids = []
-    @getContent()
-    @initRefresh()
-    @initForm()
-  
-  # 
-  # Gets an initial set of notes.
-  # 
-  getContent: ->
-    Api.notes @project_id, (notes) =>
-      $.each notes, (i, note) =>
-        # render note if it not present in loaded list
-        # or skip if rendered
-        if $.inArray(note.id, @note_ids) == -1
-          @note_ids.push(note.id)
-          @renderNote(note)
-          @scrollDown()
-          $("abbr.timeago").timeago()
-
-  initRefresh: ->
-    setInterval =>
-      @refresh()
-    , 10000
-
-  refresh: ->
-    @getContent()
-
-  scrollDown: ->
-    notes = $('ul.notes')
-    $('body, html').scrollTop(notes.height())
-
-  initForm: ->
-    form = $('.wall-note-form')
-    form.find("#target_type").val('wall')
-
-    form.on 'ajax:success', =>
-      @refresh()
-      form.find(".js-note-text").val("").trigger("input")
-    
-    form.on 'ajax:complete', ->
-      form.find(".js-comment-button").removeAttr('disabled')
-      form.find(".js-comment-button").removeClass('disabled')
-
-    form.on "click", ".js-choose-note-attachment-button", ->
-      form.find(".js-note-attachment-input").click()
-
-    form.on "change", ".js-note-attachment-input", ->
-      filename = $(this).val().replace(/^.*[\\\/]/, '')
-      form.find(".js-attachment-filename").text(filename)
-    
-    form.find('.note_text').keydown (e) ->
-      if e.ctrlKey && e.keyCode == 13
-        form.find('.js-comment-button').submit()
-
-    form.show()
-  
-  renderNote: (note) ->
-    template = @noteTemplate()
-    template = template.replace('{{author_name}}', note.author.name)
-    template = template.replace(/{{created_at}}/g, note.created_at)
-    template = template.replace('{{text}}', simpleFormat(note.body))
-
-    if note.attachment
-      file = '<i class="icon-paper-clip"/><a href="' + gon.relative_url_root + '/files/note/' + note.id + '/' + note.attachment + '">' + note.attachment + '</a>'
-    else
-      file = ''
-    template = template.replace('{{file}}', file)
-
-
-    $('ul.notes').append(template)
-
-  noteTemplate: ->
-    return '<li>
-      <strong class="wall-author">{{author_name}}</strong>
-      <span class="wall-text">
-        {{text}}
-        <span class="wall-file">{{file}}</span>
-      </span>
-      <abbr class="timeago" title="{{created_at}}">{{created_at}}</abbr>
-    </li>'
-
-@Wall = Wall
@@ -1,55 +0,0 @@
-.wall-page {
-  .wall-note-form {
-    @extend .col-md-12;
-
-    margin: 0;
-    height: 140px;
-    background: #F9F9F9;
-    position: fixed;
-    bottom: 0px;
-    padding: 3px;
-    padding-bottom: 25px;
-    border: 1px solid #DDD;
-  }
-
-  .notes {
-    margin-bottom: 160px;
-    background: #FFE;
-    border: 1px solid #EED;
-
-    > li {
-      @extend .clearfix;
-      border-bottom: 1px solid #EED;
-      padding: 10px;
-    }
-
-    .wall-author {
-      color: #666;
-      float: left;
-      font-size: 12px;
-      width: 120px;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-    }
-
-    .wall-text {
-      border-left: 1px solid #CCC;
-      margin-left: 10px;
-      padding-left: 10px;
-      float: left;
-      width: 75%;
-    }
-
-    .wall-file {
-      margin-left: 8px;
-      background: #EEE;
-    }
-
-    abbr {
-      float: right;
-      color: #AAA;
-      border: none;
-    }
-  }
-}
@@ -1,20 +0,0 @@
-class Projects::WallsController < Projects::ApplicationController
-  before_filter :module_enabled
-
-  respond_to :js, :html
-
-  def show
-    @note = @project.notes.new
-
-    respond_to do |format|
-      format.html
-    end
-  end
-
-  protected
-
-  def module_enabled
-    return render_404 unless @project.wall_enabled
-  end
-end
-
@@ -109,8 +109,6 @@ module EventsHelper
           "#{event.note_target_type} ##{truncate event.note_target_iid}"
         end
       end
-    elsif event.wall_note?
-      link_to 'wall', project_wall_path(event.project)
     else
       content_tag :strong do
         "(deleted)"
@@ -139,7 +139,7 @@ module ProjectsHelper
       nav_tabs << :settings
     end
  
-    [:issues, :wiki, :wall, :snippets].each do |feature|
+    [:issues, :wiki, :snippets].each do |feature|
       nav_tabs << feature if project.send :"#{feature}_enabled"
     end
  
@@ -61,7 +61,6 @@ module SearchHelper
         { label: "#{prefix} - Milestones",     url: project_milestones_path(@project) },
         { label: "#{prefix} - Snippets",       url: project_snippets_path(@project) },
         { label: "#{prefix} - Team",           url: project_team_index_path(@project) },
-        { label: "#{prefix} - Wall",           url: project_wall_path(@project) },
         { label: "#{prefix} - Wiki",           url: project_wikis_path(@project) },
       ]
     else
@@ -32,14 +32,5 @@ module Emails
                          cc: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
     end
-
-    def note_wall_email(recipient_id, note_id)
-      @note = Note.find(note_id)
-      @project = @note.project
-      @target_url = project_wall_url(@note.project, anchor: "note_#{@note.id}")
-      mail(from: sender(@note.author_id),
-           cc: recipient(recipient_id),
-           subject: subject("Note on wall"))
-    end
   end
 end
@@ -286,10 +286,6 @@ class Event &lt; ActiveRecord::Base
     end.to_s
   end
  
-  def wall_note?
-    target.noteable_type.blank?
-  end
-
   def note_target_type
     if target.noteable_type.present?
       target.noteable_type.titleize
@@ -251,10 +251,6 @@ class Note &lt; ActiveRecord::Base
     for_merge_request? && for_diff_line?
   end
  
-  def for_wall?
-    noteable_type.blank?
-  end
-
   # override to return commits, which are not active record
   def noteable
     if for_commit?
@@ -295,8 +291,6 @@ class Note &lt; ActiveRecord::Base
   def noteable_type_name
     if noteable_type.present?
       noteable_type.downcase
-    else
-      "wall"
     end
   end
  
@@ -31,7 +31,6 @@ class Project &lt; ActiveRecord::Base
  
   default_value_for :archived, false
   default_value_for :issues_enabled, true
-  default_value_for :wall_enabled, true
   default_value_for :merge_requests_enabled, true
   default_value_for :wiki_enabled, true
   default_value_for :snippets_enabled, true
@@ -39,7 +38,7 @@ class Project &lt; ActiveRecord::Base
   ActsAsTaggableOn.strict_case_match = true
  
   attr_accessible :name, :path, :description, :issues_tracker, :label_list,
-    :issues_enabled, :wall_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id,
+    :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id,
     :wiki_enabled, :visibility_level, :import_url, :last_activity_at, as: [:default, :admin]
  
   attr_accessible :namespace_id, :creator_id, as: :admin
@@ -98,7 +97,7 @@ class Project &lt; ActiveRecord::Base
             exclusion: { in: Gitlab::Blacklist.path },
             format: { with: Gitlab::Regex.path_regex,
                       message: "only letters, digits & '_' '-' '.' allowed. Letter or digit should be first" }
-  validates :issues_enabled, :wall_enabled, :merge_requests_enabled,
+  validates :issues_enabled, :merge_requests_enabled,
             :wiki_enabled, inclusion: { in: [true, false] }
   validates :issues_tracker_id, length: { maximum: 255 }, allow_blank: true
   validates :namespace, presence: true
@@ -3,12 +3,9 @@ class NoteObserver &lt; BaseObserver
     notification.new_note(note)
  
     # Skip system notes, like status changes and cross-references.
-    # Skip wall notes to prevent spamming of dashboard
-    if note.noteable_type.present? && !note.system
+    unless note.system
       event_service.leave_note(note, note.author)
-    end
  
-    unless note.system?
       # Create a cross-reference note if this Note contains GFM that names an
       # issue, merge request, or commit.
       note.references.each do |mentioned|
@@ -106,7 +106,6 @@ class NotificationService
   # TODO: split on methods and refactor
   #
   def new_note(note)
-    # ignore wall messages
     return true unless note.noteable_type.present?
  
     # ignore gitlab service messages
@@ -19,7 +19,6 @@ module Projects
       default_opts = {
         issues_enabled: default_features.issues,
         wiki_enabled: default_features.wiki,
-        wall_enabled: default_features.wall,
         snippets_enabled: default_features.snippets,
         merge_requests_enabled: default_features.merge_requests,
         visibility_level: default_features.visibility_level
@@ -36,10 +36,6 @@
     = nav_link(controller: :wikis) do
       = link_to 'Wiki', project_wiki_path(@project, :home)
  
-  - if project_nav_tab? :wall
-    = nav_link(controller: :walls) do
-      = link_to 'Wall', project_wall_path(@project)
-
   - if project_nav_tab? :snippets
     = nav_link(controller: :snippets) do
       = link_to 'Snippets', project_snippets_path(@project)
@@ -1 +0,0 @@
-= render 'note_message'
@@ -1,9 +0,0 @@
-New message on the project wall <%= @note.project %>
-
-<%= url_for(project_wall_url(@note.project, anchor: "note_#{@note.id}")) %>
-
-
-<%= @note.author_name %>
-
-<%= @note.note %>
-
@@ -74,13 +74,6 @@
                   %span.descr Pages for project documentation
  
             .form-group
-              = f.label :wall_enabled, "Wall", class: 'control-label'
-              .col-sm-10
-                .checkbox
-                  = f.check_box :wall_enabled
-                  %span.descr Simple chat system for broadcasting inside project
-
-            .form-group
               = f.label :snippets_enabled, "Snippets", class: 'control-label'
               .col-sm-10
                 .checkbox
@@ -1,23 +0,0 @@
-%div.wall-page
-  %ul.notes
-
-  - if can? current_user, :write_note, @project
-    .note-form-holder
-      = form_for [@project, @note], remote: true, html: { multipart: true, id: nil, class: "new_note wall-note-form" }, authenticity_token: true do |f|
-        = note_target_fields
-        .note_text_and_preview
-          = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
-        .note-form-actions
-          .buttons
-            = f.submit 'Add Comment', class: "btn comment-btn btn-grouped js-comment-button"
-
-          .note-form-option
-            %a.choose-btn.btn.btn-small.js-choose-note-attachment-button
-              %i.icon-paper-clip
-                %span Choose File ...
-            &nbsp;
-            %span.file_name.js-attachment-filename File name...
-            = f.file_field :attachment, class: "js-note-attachment-input hidden"
-
-          .hint.pull-right CTRL + Enter to send message
-        .clearfix
@@ -73,7 +73,6 @@ production: &amp;base
       issues: true
       merge_requests: true
       wiki: true
-      wall: false
       snippets: false
       visibility_level: "private"  # can be "private" | "internal" | "public"
  
@@ -95,7 +95,6 @@ Settings.gitlab[&#39;default_projects_features&#39;] ||= {}
 Settings.gitlab.default_projects_features['issues']         = true if Settings.gitlab.default_projects_features['issues'].nil?
 Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil?
 Settings.gitlab.default_projects_features['wiki']           = true if Settings.gitlab.default_projects_features['wiki'].nil?
-Settings.gitlab.default_projects_features['wall']           = false if Settings.gitlab.default_projects_features['wall'].nil?
 Settings.gitlab.default_projects_features['snippets']       = false if Settings.gitlab.default_projects_features['snippets'].nil?
 Settings.gitlab.default_projects_features['visibility_level']    = Settings.send(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE)
 Settings.gitlab['repository_downloads_path'] = File.absolute_path(Settings.gitlab['repository_downloads_path'] || 'tmp/repositories', Rails.root)
@@ -209,12 +209,6 @@ Gitlab::Application.routes.draw do
         end
       end
  
-      resource :wall, only: [:show], constraints: {id: /\d+/} do
-        member do
-          get 'notes'
-        end
-      end
-
       resource :repository, only: [:show] do
         member do
           get "stats"
 # Notes
  
-Notes can be wall notes or comments on snippets, issues or merge requests.
-
-## Wall
-
-### List project wall notes
-
-Get a list of project wall notes.
-
-```
-GET /projects/:id/notes
-```
-
-Parameters:
-
-+ `id` (required) - The ID of a project
-
-```json
-[
-  {
-    "id": 522,
-    "body": "The solution is rather tricky",
-    "attachment": null,
-    "author": {
-      "id": 1,
-      "username": "john_smith",
-      "email": "john@example.com",
-      "name": "John Smith",
-      "state": "active",
-      "created_at": "2012-05-23T08:00:58Z"
-    },
-    "created_at": "2012-11-27T19:16:44Z"
-  }
-]
-```
-
-### Get single wall note
-
-Returns a single wall note.
-
-```
-GET /projects/:id/notes/:note_id
-```
-
-Parameters:
-
-+ `id` (required) - The ID of a project
-+ `note_id` (required) - The ID of a wall note
-
-
-### Create new wall note
-
-Creates a new wall note.
-
-```
-POST /projects/:id/notes
-```
-
-Parameters:
-
-+ `id` (required) - The ID of a project
-+ `body` (required) - The content of a note
-
+Notes are comments on snippets, issues or merge requests.
  
 ## Issues
  
@@ -30,7 +30,6 @@ GET /projects
     "path_with_namespace": "diaspora/diaspora-client",
     "issues_enabled": true,
     "merge_requests_enabled": true,
-    "wall_enabled": false,
     "wiki_enabled": true,
     "snippets_enabled": false,
     "created_at": "2013-09-30T13: 46: 02Z",
@@ -66,7 +65,6 @@ GET /projects
     "path_with_namespace": "brightbox/puppet",
     "issues_enabled": true,
     "merge_requests_enabled": true,
-    "wall_enabled": false,
     "wiki_enabled": true,
     "snippets_enabled": false,
     "created_at": "2013-09-30T13:46:02Z",
@@ -136,7 +134,6 @@ Parameters:
   "path_with_namespace": "diaspora/diaspora-project-site",
   "issues_enabled": true,
   "merge_requests_enabled": true,
-  "wall_enabled": false,
   "wiki_enabled": true,
   "snippets_enabled": false,
   "created_at": "2013-09-30T13: 46: 02Z",
@@ -252,7 +249,6 @@ Parameters:
 + `namespace_id` (optional) - namespace for the new project (defaults to user)
 + `description` (optional) - short project description
 + `issues_enabled` (optional)
-+ `wall_enabled` (optional)
 + `merge_requests_enabled` (optional)
 + `wiki_enabled` (optional) 
 + `snippets_enabled` (optional)
@@ -276,7 +272,6 @@ Parameters:
 + `description` (optional) - short project description
 + `default_branch` (optional) - 'master' by default
 + `issues_enabled` (optional)
-+ `wall_enabled` (optional)
 + `merge_requests_enabled` (optional)
 + `wiki_enabled` (optional) 
 + `snippets_enabled` (optional)
@@ -48,7 +48,6 @@ You can use GFM in
  
 - commit messages
 - comments
-- wall posts
 - issues
 - merge requests
 - milestones
@@ -13,7 +13,6 @@ If a user is a GitLab administrator they receive all permissions.
 |---------------------------------------|---------|------------|-------------|----------|--------|
 | Create new issue                      | ✓       | ✓          | ✓           | ✓        | ✓      |
 | Leave comments                        | ✓       | ✓          | ✓           | ✓        | ✓      |
-| Write on project wall                 | ✓       | ✓          | ✓           | ✓        | ✓      |
 | Pull project code                     |         | ✓          | ✓           | ✓        | ✓      |
 | Download project                      |         | ✓          | ✓           | ✓        | ✓      |
 | Create code snippets                  |         | ✓          | ✓           | ✓        | ✓      |
@@ -26,12 +26,6 @@ This is a separate system for documentation, built right into GitLab.
  
 It is source controlled and is very convenient if you don't want to keep you documentation in your source code, but you do want to keep it in your GitLab project.
  
-## Wall
-
-For simple, project specific conversations, the wall can be used.
-
-It's very lightweight and simple and works well if you're not interested in using issues, but still want to occasionally communicate within a project.
-
 ## Snippets
  
 Snippets are little bits of code or text.
@@ -35,11 +35,6 @@ Feature: Project active tab
     Then the active main tab should be Merge Requests
     And no other main tabs should be active
  
-  Scenario: On Project Wall
-    Given I visit my project's wall page
-    Then the active main tab should be Wall
-    And no other main tabs should be active
-
   Scenario: On Project Wiki
     Given I visit my project's wiki page
     Then the active main tab should be Wiki
@@ -1,16 +0,0 @@
-Feature: Project Wall
-  In order to use Project Wall
-  A user should be able to read and write messages
-
-  Background:
-    Given I sign in as a user
-    And I own project "Shop"
-    And I visit project "Shop" wall page
-
-  @javascript
-  Scenario: Write comment
-    Given I write new comment "my special test message"
-    Then I should see project wall note "my special test message"
-
-    Then I visit project "Shop" wall page
-    And I should see project wall note "my special test message"
@@ -1,18 +0,0 @@
-class ProjectWall < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedProject
-  include SharedNote
-  include SharedPaths
-
-
-  Given 'I write new comment "my special test message"' do
-    within(".wall-note-form") do
-      fill_in "note[note]", with: "my special test message"
-      click_button "Add Comment"
-    end
-  end
-
-  Then 'I should see project wall note "my special test message"' do
-    page.should have_content "my special test message"
-  end
-end
@@ -204,10 +204,6 @@ module SharedPaths
     visit project_merge_requests_path(@project)
   end
  
-  step "I visit my project's wall page" do
-    visit project_wall_path(@project)
-  end
-
   step "I visit my project's wiki page" do
     visit project_wiki_path(@project, :home)
   end
@@ -319,10 +315,6 @@ module SharedPaths
     visit project_team_index_path(project)
   end
  
-  step 'I visit project "Shop" wall page' do
-    visit project_wall_path(project)
-  end
-
   step 'I visit project wiki page' do
     visit project_wiki_path(@project, :home)
   end
@@ -48,7 +48,7 @@ module API
       expose :owner, using: Entities::UserBasic, unless: ->(project, options) { project.group }
       expose :name, :name_with_namespace
       expose :path, :path_with_namespace
-      expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at
+      expose :issues_enabled, :merge_requests_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at
       expose :namespace
       expose :forked_from_project, using: Entities::ForkedFromProject, :if => lambda{ | project, options | project.forked? }
     end
@@ -6,55 +6,6 @@ module API
     NOTEABLE_TYPES = [Issue, MergeRequest, Snippet]
  
     resource :projects do
-      # Get a list of project wall notes
-      #
-      # Parameters:
-      #   id (required) - The ID of a project
-      # Example Request:
-      #   GET /projects/:id/notes
-      get ":id/notes" do
-        @notes = user_project.notes.common
-
-        # Get recent notes if recent = true
-        @notes = @notes.order('id DESC') if params[:recent]
-
-        present paginate(@notes), with: Entities::Note
-      end
-
-      # Get a single project wall note
-      #
-      # Parameters:
-      #   id (required) - The ID of a project
-      #   note_id (required) - The ID of a note
-      # Example Request:
-      #   GET /projects/:id/notes/:note_id
-      get ":id/notes/:note_id" do
-        @note = user_project.notes.common.find(params[:note_id])
-        present @note, with: Entities::Note
-      end
-
-      # Create a new project wall note
-      #
-      # Parameters:
-      #   id (required) - The ID of a project
-      #   body (required) - The content of a note
-      # Example Request:
-      #   POST /projects/:id/notes
-      post ":id/notes" do
-        required_attributes! [:body]
-
-        @note = user_project.notes.new(note: params[:body])
-        @note.author = current_user
-
-        if @note.save
-          present @note, with: Entities::Note
-        else
-          # :note is exposed as :body, but :note is set on error
-          bad_request!(:note) if @note.errors[:note].any?
-          not_found!
-        end
-      end
-
       NOTEABLE_TYPES.each do |noteable_type|
         noteables_str = noteable_type.to_s.underscore.pluralize
         noteable_id_str = "#{noteable_type.to_s.underscore}_id"
@@ -71,7 +71,6 @@ module API
       #   name (required) - name for new project
       #   description (optional) - short project description
       #   issues_enabled (optional)
-      #   wall_enabled (optional)
       #   merge_requests_enabled (optional)
       #   wiki_enabled (optional)
       #   snippets_enabled (optional)
@@ -86,7 +85,6 @@ module API
                                      :path,
                                      :description,
                                      :issues_enabled,
-                                     :wall_enabled,
                                      :merge_requests_enabled,
                                      :wiki_enabled,
                                      :snippets_enabled,
@@ -114,7 +112,6 @@ module API
       #   description (optional) - short project description
       #   default_branch (optional) - 'master' by default
       #   issues_enabled (optional)
-      #   wall_enabled (optional)
       #   merge_requests_enabled (optional)
       #   wiki_enabled (optional)
       #   snippets_enabled (optional)
@@ -129,7 +126,6 @@ module API
                                      :description,
                                      :default_branch,
                                      :issues_enabled,
-                                     :wall_enabled,
                                      :merge_requests_enabled,
                                      :wiki_enabled,
                                      :snippets_enabled,
@@ -87,17 +87,6 @@ describe &quot;Internal Project Access&quot;, feature: true  do
     it { should be_denied_for :visitor }
   end
  
-  describe "GET /:project_path/wall" do
-    subject { project_wall_path(project) }
-
-    it { should be_allowed_for master }
-    it { should be_allowed_for reporter }
-    it { should be_allowed_for :admin }
-    it { should be_allowed_for guest }
-    it { should be_allowed_for :user }
-    it { should be_denied_for :visitor }
-  end
-
   describe "GET /:project_path/blob" do
     before do
       commit = project.repository.commit
@@ -87,17 +87,6 @@ describe &quot;Private Project Access&quot;, feature: true  do
     it { should be_denied_for :visitor }
   end
  
-  describe "GET /:project_path/wall" do
-    subject { project_wall_path(project) }
-
-    it { should be_allowed_for master }
-    it { should be_allowed_for reporter }
-    it { should be_allowed_for :admin }
-    it { should be_denied_for guest }
-    it { should be_denied_for :user }
-    it { should be_denied_for :visitor }
-  end
-
   describe "GET /:project_path/blob" do
     before do
       commit = project.repository.commit
@@ -92,17 +92,6 @@ describe &quot;Public Project Access&quot;, feature: true  do
     it { should be_denied_for :visitor }
   end
  
-  describe "GET /:project_path/wall" do
-    subject { project_wall_path(project) }
-
-    it { should be_allowed_for master }
-    it { should be_allowed_for reporter }
-    it { should be_allowed_for :admin }
-    it { should be_allowed_for guest }
-    it { should be_allowed_for :user }
-    it { should be_allowed_for :visitor }
-  end
-
   describe "GET /:project_path/blob" do
     before do
       commit = project.repository.commit
@@ -410,22 +410,6 @@ describe Notify do
         end
       end
  
-      describe 'on a project wall' do
-        let(:note_on_the_wall_path) { project_wall_path(project, anchor: "note_#{note.id}") }
-
-        subject { Notify.note_wall_email(recipient.id, note.id) }
-
-        it_behaves_like 'a note email'
-
-        it 'has the correct subject' do
-          should have_subject /#{project.name}/
-        end
-
-        it 'contains a link to the wall note' do
-          should have_body_text /#{note_on_the_wall_path}/
-        end
-      end
-
       describe 'on a commit' do
         let(:commit) { project.repository.commit }
  
@@ -13,58 +13,8 @@ describe API::API, api: true  do
   let!(:issue_note) { create(:note, noteable: issue, project: project, author: user) }
   let!(:merge_request_note) { create(:note, noteable: merge_request, project: project, author: user) }
   let!(:snippet_note) { create(:note, noteable: snippet, project: project, author: user) }
-  let!(:wall_note) { create(:note, project: project, author: user) }
   before { project.team << [user, :reporter] }
  
-  describe "GET /projects/:id/notes" do
-    context "when unauthenticated" do
-      it "should return authentication error" do
-        get api("/projects/#{project.id}/notes")
-        response.status.should == 401
-      end
-    end
-
-    context "when authenticated" do
-      it "should return project wall notes" do
-        get api("/projects/#{project.id}/notes", user)
-        response.status.should == 200
-        json_response.should be_an Array
-        json_response.first['body'].should == wall_note.note
-      end
-    end
-  end
-
-  describe "GET /projects/:id/notes/:note_id" do
-    it "should return a wall note by id" do
-      get api("/projects/#{project.id}/notes/#{wall_note.id}", user)
-      response.status.should == 200
-      json_response['body'].should == wall_note.note
-    end
-
-    it "should return a 404 error if note not found" do
-      get api("/projects/#{project.id}/notes/123", user)
-      response.status.should == 404
-    end
-  end
-
-  describe "POST /projects/:id/notes" do
-    it "should create a new wall note" do
-      post api("/projects/#{project.id}/notes", user), body: 'hi!'
-      response.status.should == 201
-      json_response['body'].should == 'hi!'
-    end
-
-    it "should return 401 unauthorized error" do
-      post api("/projects/#{project.id}/notes")
-      response.status.should == 401
-    end
-
-    it "should return a 400 bad request if body is missing" do
-      post api("/projects/#{project.id}/notes", user)
-      response.status.should == 400
-    end
-  end
-
   describe "GET /projects/:id/noteable/:noteable_id/notes" do
     context "when noteable is an Issue" do
       it "should return an array of issue notes" do
@@ -126,7 +126,6 @@ describe API::API, api: true  do
       project = attributes_for(:project, {
         description: Faker::Lorem.sentence,
         issues_enabled: false,
-        wall_enabled: false,
         merge_requests_enabled: false,
         wiki_enabled: false
       })
@@ -208,7 +207,6 @@ describe API::API, api: true  do
       project = attributes_for(:project, {
         description: Faker::Lorem.sentence,
         issues_enabled: false,
-        wall_enabled: false,
         merge_requests_enabled: false,
         wiki_enabled: false
       })
@@ -56,7 +56,6 @@ end
 #      projects POST   /projects(.:format)     projects#create
 #   new_project GET    /projects/new(.:format) projects#new
 #  fork_project POST   /:id/fork(.:format)     projects#fork
-#  wall_project GET    /:id/wall(.:format)     projects#wall
 # files_project GET    /:id/files(.:format)    projects#files
 #  edit_project GET    /:id/edit(.:format)     projects#edit
 #       project GET    /:id(.:format)          projects#show
@@ -75,10 +74,6 @@ describe ProjectsController, &quot;routing&quot; do
     post("/gitlab/gitlabhq/fork").should route_to('projects#fork', id: 'gitlab/gitlabhq')
   end
  
-  it "to #wall" do
-    get("/gitlab/gitlabhq/wall").should route_to('projects/walls#show', project_id: 'gitlab/gitlabhq')
-  end
-
   it "to #edit" do
     get("/gitlab/gitlabhq/edit").should route_to('projects#edit', id: 'gitlab/gitlabhq')
   end
@@ -65,7 +65,6 @@ describe Projects::CreateService do
         @settings.stub(:issues) { true }
         @settings.stub(:merge_requests) { true }
         @settings.stub(:wiki) { true }
-        @settings.stub(:wall) { true }
         @settings.stub(:snippets) { true }
         stub_const("Settings", Class.new)
         @restrictions = double("restrictions")
@@ -108,7 +107,6 @@ describe Projects::CreateService do
         @settings.stub(:issues) { true }
         @settings.stub(:merge_requests) { true }
         @settings.stub(:wiki) { true }
-        @settings.stub(:wall) { true }
         @settings.stub(:snippets) { true }
         @settings.stub(:visibility_level) { Gitlab::VisibilityLevel::PRIVATE }
         stub_const("Settings", Class.new)
...	...	@@ -34,6 +34,7 @@ v 7.0.0
34	34	- Skip init script check on omnibus-gitlab
35	35	- Be more selective when killing stray Sidekiqs
36	36	- Check LDAP user filter during sign-in
	37	+ - Remove wall feature (no data loss - you can take it from database)
37	38
38	39	v 6.9.2
39	40	- Revert the commit that broke the LDAP user filter
...	...
...	...	@@ -34,8 +34,6 @@ class Dispatcher
34	34	new Activities()
35	35	when 'projects:new', 'projects:edit'
36	36	new Project()
37		- when 'projects:walls:show'
38		- new Wall(project_id)
39	37	when 'projects:teams:members:index'
40	38	new TeamMembers()
41	39	when 'groups:members'
...	...
...	...	@@ -1,85 +0,0 @@
1		-class Wall
2		- constructor: (project_id) ->
3		- @project_id = project_id
4		- @note_ids = []
5		- @getContent()
6		- @initRefresh()
7		- @initForm()
8		-
9		- #
10		- # Gets an initial set of notes.
11		- #
12		- getContent: ->
13		- Api.notes @project_id, (notes) =>
14		- $.each notes, (i, note) =>
15		- # render note if it not present in loaded list
16		- # or skip if rendered
17		- if $.inArray(note.id, @note_ids) == -1
18		- @note_ids.push(note.id)
19		- @renderNote(note)
20		- @scrollDown()
21		- $("abbr.timeago").timeago()
22		-
23		- initRefresh: ->
24		- setInterval =>
25		- @refresh()
26		- , 10000
27		-
28		- refresh: ->
29		- @getContent()
30		-
31		- scrollDown: ->
32		- notes = $('ul.notes')
33		- $('body, html').scrollTop(notes.height())
34		-
35		- initForm: ->
36		- form = $('.wall-note-form')
37		- form.find("#target_type").val('wall')
38		-
39		- form.on 'ajax:success', =>
40		- @refresh()
41		- form.find(".js-note-text").val("").trigger("input")
42		-
43		- form.on 'ajax:complete', ->
44		- form.find(".js-comment-button").removeAttr('disabled')
45		- form.find(".js-comment-button").removeClass('disabled')
46		-
47		- form.on "click", ".js-choose-note-attachment-button", ->
48		- form.find(".js-note-attachment-input").click()
49		-
50		- form.on "change", ".js-note-attachment-input", ->
51		- filename = $(this).val().replace(/^.*[\\\/]/, '')
52		- form.find(".js-attachment-filename").text(filename)
53		-
54		- form.find('.note_text').keydown (e) ->
55		- if e.ctrlKey && e.keyCode == 13
56		- form.find('.js-comment-button').submit()
57		-
58		- form.show()
59		-
60		- renderNote: (note) ->
61		- template = @noteTemplate()
62		- template = template.replace('{{author_name}}', note.author.name)
63		- template = template.replace(/{{created_at}}/g, note.created_at)
64		- template = template.replace('{{text}}', simpleFormat(note.body))
65		-
66		- if note.attachment
67		- file = '<i class="icon-paper-clip"/><a href="' + gon.relative_url_root + '/files/note/' + note.id + '/' + note.attachment + '">' + note.attachment + '</a>'
68		- else
69		- file = ''
70		- template = template.replace('{{file}}', file)
71		-
72		-
73		- $('ul.notes').append(template)
74		-
75		- noteTemplate: ->
76		- return '<li>
77		- <strong class="wall-author">{{author_name}}</strong>
78		- <span class="wall-text">
79		- {{text}}
80		- <span class="wall-file">{{file}}</span>
81		- </span>
82		- <abbr class="timeago" title="{{created_at}}">{{created_at}}</abbr>
83		- </li>'
84		-
85		-@Wall = Wall
...	...	@@ -1,55 +0,0 @@
1		-.wall-page {
2		- .wall-note-form {
3		- @extend .col-md-12;
4		-
5		- margin: 0;
6		- height: 140px;
7		- background: #F9F9F9;
8		- position: fixed;
9		- bottom: 0px;
10		- padding: 3px;
11		- padding-bottom: 25px;
12		- border: 1px solid #DDD;
13		- }
14		-
15		- .notes {
16		- margin-bottom: 160px;
17		- background: #FFE;
18		- border: 1px solid #EED;
19		-
20		- > li {
21		- @extend .clearfix;
22		- border-bottom: 1px solid #EED;
23		- padding: 10px;
24		- }
25		-
26		- .wall-author {
27		- color: #666;
28		- float: left;
29		- font-size: 12px;
30		- width: 120px;
31		- text-overflow: ellipsis;
32		- white-space: nowrap;
33		- overflow: hidden;
34		- }
35		-
36		- .wall-text {
37		- border-left: 1px solid #CCC;
38		- margin-left: 10px;
39		- padding-left: 10px;
40		- float: left;
41		- width: 75%;
42		- }
43		-
44		- .wall-file {
45		- margin-left: 8px;
46		- background: #EEE;
47		- }
48		-
49		- abbr {
50		- float: right;
51		- color: #AAA;
52		- border: none;
53		- }
54		- }
55		-}
...	...	@@ -1,20 +0,0 @@
1		-class Projects::WallsController < Projects::ApplicationController
2		- before_filter :module_enabled
3		-
4		- respond_to :js, :html
5		-
6		- def show
7		- @note = @project.notes.new
8		-
9		- respond_to do \|format\|
10		- format.html
11		- end
12		- end
13		-
14		- protected
15		-
16		- def module_enabled
17		- return render_404 unless @project.wall_enabled
18		- end
19		-end
20		-
...	...	@@ -109,8 +109,6 @@ module EventsHelper
109	109	"#{event.note_target_type} ##{truncate event.note_target_iid}"
110	110	end
111	111	end
112		- elsif event.wall_note?
113		- link_to 'wall', project_wall_path(event.project)
114	112	else
115	113	content_tag :strong do
116	114	"(deleted)"
...	...
...	...	@@ -139,7 +139,7 @@ module ProjectsHelper
139	139	nav_tabs << :settings
140	140	end
141	141
142		- [:issues, :wiki, :wall, :snippets].each do \|feature\|
	142	+ [:issues, :wiki, :snippets].each do \|feature\|
143	143	nav_tabs << feature if project.send :"#{feature}_enabled"
144	144	end
145	145
...	...
...	...	@@ -61,7 +61,6 @@ module SearchHelper
61	61	{ label: "#{prefix} - Milestones", url: project_milestones_path(@project) },
62	62	{ label: "#{prefix} - Snippets", url: project_snippets_path(@project) },
63	63	{ label: "#{prefix} - Team", url: project_team_index_path(@project) },
64		- { label: "#{prefix} - Wall", url: project_wall_path(@project) },
65	64	{ label: "#{prefix} - Wiki", url: project_wikis_path(@project) },
66	65	]
67	66	else
...	...
...	...	@@ -32,14 +32,5 @@ module Emails
32	32	cc: recipient(recipient_id),
33	33	subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
34	34	end
35		-
36		- def note_wall_email(recipient_id, note_id)
37		- @note = Note.find(note_id)
38		- @project = @note.project
39		- @target_url = project_wall_url(@note.project, anchor: "note_#{@note.id}")
40		- mail(from: sender(@note.author_id),
41		- cc: recipient(recipient_id),
42		- subject: subject("Note on wall"))
43		- end
44	35	end
45	36	end
...	...
...	...	@@ -286,10 +286,6 @@ class Event < ActiveRecord::Base
286	286	end.to_s
287	287	end
288	288
289		- def wall_note?
290		- target.noteable_type.blank?
291		- end
292		-
293	289	def note_target_type
294	290	if target.noteable_type.present?
295	291	target.noteable_type.titleize
...	...