Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
0ae89200
Commit
0ae89200
authored
Apr 10, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove Wiki and db table since we use gollum now
parent
0415566b
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
106 deletions
+11
-106
app/contexts/search_context.rb
app/contexts/search_context.rb
+1
-1
app/models/project.rb
app/models/project.rb
+0
-1
app/models/wiki.rb
app/models/wiki.rb
+0
-55
db/migrate/20130410175022_remove_wiki_table.rb
db/migrate/20130410175022_remove_wiki_table.rb
+9
-0
db/schema.rb
db/schema.rb
+1
-14
spec/models/wiki_spec.rb
spec/models/wiki_spec.rb
+0
-35
No files found.
app/contexts/search_context.rb
View file @
0ae89200
...
@@ -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
...
...
app/models/project.rb
View file @
0ae89200
...
@@ -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
...
...
app/models/wiki.rb
deleted
100644 → 0
View file @
0415566b
# == 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
db/migrate/20130410175022_remove_wiki_table.rb
0 → 100644
View file @
0ae89200
class
RemoveWikiTable
<
ActiveRecord
::
Migration
def
up
drop_table
:wikis
end
def
down
raise
ActiveRecord
::
IrreversibleMigration
end
end
db/schema.rb
View file @
0ae89200
...
@@ -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
=>
201304
04164628
)
do
ActiveRecord
::
Schema
.
define
(
:version
=>
201304
10175022
)
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
spec/models/wiki_spec.rb
deleted
100644 → 0
View file @
0415566b
# == 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment