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
Boxiang Sun
gitlab-ce
Commits
ac8c136e
Commit
ac8c136e
authored
Aug 21, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue_20900_remove_ignore_columns' into 'master'
Issue 20900 remove ignore columns See merge request !12166
parents
b4c201a2
998833df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
4 deletions
+0
-4
app/models/issue.rb
app/models/issue.rb
+0
-3
app/models/merge_request.rb
app/models/merge_request.rb
+0
-1
No files found.
app/models/issue.rb
View file @
ac8c136e
...
@@ -9,11 +9,8 @@ class Issue < ActiveRecord::Base
...
@@ -9,11 +9,8 @@ class Issue < ActiveRecord::Base
include
Spammable
include
Spammable
include
FasterCacheKeys
include
FasterCacheKeys
include
RelativePositioning
include
RelativePositioning
include
IgnorableColumn
include
CreatedAtFilterable
include
CreatedAtFilterable
ignore_column
:position
DueDateStruct
=
Struct
.
new
(
:title
,
:name
).
freeze
DueDateStruct
=
Struct
.
new
(
:title
,
:name
).
freeze
NoDueDate
=
DueDateStruct
.
new
(
'No Due Date'
,
'0'
).
freeze
NoDueDate
=
DueDateStruct
.
new
(
'No Due Date'
,
'0'
).
freeze
AnyDueDate
=
DueDateStruct
.
new
(
'Any Due Date'
,
''
).
freeze
AnyDueDate
=
DueDateStruct
.
new
(
'Any Due Date'
,
''
).
freeze
...
...
app/models/merge_request.rb
View file @
ac8c136e
...
@@ -7,7 +7,6 @@ class MergeRequest < ActiveRecord::Base
...
@@ -7,7 +7,6 @@ class MergeRequest < ActiveRecord::Base
include
IgnorableColumn
include
IgnorableColumn
include
CreatedAtFilterable
include
CreatedAtFilterable
ignore_column
:position
ignore_column
:locked_at
ignore_column
:locked_at
belongs_to
:target_project
,
class_name:
"Project"
belongs_to
:target_project
,
class_name:
"Project"
...
...
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