Commit 0ae89200 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Remove Wiki and db table since we use gollum now

parent 0415566b
...@@ -13,7 +13,7 @@ class SearchContext ...@@ -13,7 +13,7 @@ class SearchContext
result[:projects] = Project.where(id: project_ids).search(query).limit(10) result[:projects] = Project.where(id: project_ids).search(query).limit(10)
result[:merge_requests] = MergeRequest.where(project_id: project_ids).search(query).limit(10) result[:merge_requests] = MergeRequest.where(project_id: project_ids).search(query).limit(10)
result[:issues] = Issue.where(project_id: project_ids).search(query).limit(10) result[:issues] = Issue.where(project_id: project_ids).search(query).limit(10)
result[:wiki_pages] = Wiki.where(project_id: project_ids).search(query).limit(10) result[:wiki_pages] = []
result result
end end
......
...@@ -53,7 +53,6 @@ class Project < ActiveRecord::Base ...@@ -53,7 +53,6 @@ class Project < ActiveRecord::Base
has_many :snippets, dependent: :destroy has_many :snippets, dependent: :destroy
has_many :deploy_keys, dependent: :destroy, class_name: "Key", foreign_key: "project_id" has_many :deploy_keys, dependent: :destroy, class_name: "Key", foreign_key: "project_id"
has_many :hooks, dependent: :destroy, class_name: "ProjectHook" has_many :hooks, dependent: :destroy, class_name: "ProjectHook"
has_many :wikis, dependent: :destroy
has_many :protected_branches, dependent: :destroy has_many :protected_branches, dependent: :destroy
has_many :user_team_project_relationships, dependent: :destroy has_many :user_team_project_relationships, dependent: :destroy
......
# == Schema Information
#
# Table name: wikis
#
# id :integer not null, primary key
# title :string(255)
# content :text
# project_id :integer
# created_at :datetime not null
# updated_at :datetime not null
# slug :string(255)
# user_id :integer
#
class Wiki < ActiveRecord::Base
attr_accessible :title, :content, :slug
belongs_to :project
belongs_to :user
has_many :notes, as: :noteable, dependent: :destroy
validates :content, presence: true
validates :user, presence: true
validates :title, presence: true, length: 1..250
before_update :set_slug
scope :ordered, order("created_at DESC")
def to_param
slug
end
class << self
def search(query)
where("title like :query OR content like :query", query: "%#{query}%")
end
end
protected
def self.regenerate_from wiki
regenerated_field = [:slug, :content, :title]
new_wiki = Wiki.new
regenerated_field.each do |field|
new_wiki.send("#{field}=", wiki.send(field))
end
new_wiki
end
def set_slug
self.slug = self.title.parameterize
end
end
class RemoveWikiTable < ActiveRecord::Migration
def up
drop_table :wikis
end
def down
raise ActiveRecord::IrreversibleMigration
end
end
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20130404164628) do ActiveRecord::Schema.define(:version => 20130410175022) do
create_table "events", :force => true do |t| create_table "events", :force => true do |t|
t.string "target_type" t.string "target_type"
...@@ -300,17 +300,4 @@ ActiveRecord::Schema.define(:version => 20130404164628) do ...@@ -300,17 +300,4 @@ ActiveRecord::Schema.define(:version => 20130404164628) do
t.integer "service_id" t.integer "service_id"
end end
create_table "wikis", :force => true do |t|
t.string "title"
t.text "content"
t.integer "project_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.string "slug"
t.integer "user_id"
end
add_index "wikis", ["project_id"], :name => "index_wikis_on_project_id"
add_index "wikis", ["slug"], :name => "index_wikis_on_slug"
end end
# == Schema Information
#
# Table name: wikis
#
# id :integer not null, primary key
# title :string(255)
# content :text
# project_id :integer
# created_at :datetime not null
# updated_at :datetime not null
# slug :string(255)
# user_id :integer
#
require 'spec_helper'
describe Wiki do
describe "Associations" do
it { should belong_to(:project) }
it { should belong_to(:user) }
it { should have_many(:notes).dependent(:destroy) }
end
describe "Mass assignment" do
it { should_not allow_mass_assignment_of(:project_id) }
it { should_not allow_mass_assignment_of(:user_id) }
end
describe "Validation" do
it { should validate_presence_of(:title) }
it { should ensure_length_of(:title).is_within(1..250) }
it { should validate_presence_of(:content) }
it { should validate_presence_of(:user) }
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment