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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
50c1a989
Commit
50c1a989
authored
6 years ago
by
Jan Provaznik
Committed by
Jarka Kadlecová
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More EE->CE fixes
parent
ef0df760
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
6 deletions
+3
-6
app/controllers/concerns/todos_actions.rb
app/controllers/concerns/todos_actions.rb
+0
-1
app/controllers/projects/todos_controller.rb
app/controllers/projects/todos_controller.rb
+1
-0
app/helpers/todos_helper.rb
app/helpers/todos_helper.rb
+1
-3
app/models/todo.rb
app/models/todo.rb
+1
-1
app/services/todo_service.rb
app/services/todo_service.rb
+0
-1
No files found.
app/controllers/concerns/todos_actions.rb
View file @
50c1a989
module
TodosActions
include
Gitlab
::
Utils
::
StrongMemoize
extend
ActiveSupport
::
Concern
def
create
...
...
This diff is collapsed.
Click to expand it.
app/controllers/projects/todos_controller.rb
View file @
50c1a989
class
Projects::TodosController
<
Projects
::
ApplicationController
include
Gitlab
::
Utils
::
StrongMemoize
include
TodosActions
before_action
:authenticate_user!
,
only:
[
:create
]
...
...
This diff is collapsed.
Click to expand it.
app/helpers/todos_helper.rb
View file @
50c1a989
...
...
@@ -169,9 +169,7 @@ module TodosHelper
end
def
todo_group_options
groups
=
current_user
.
authorized_groups
groups
=
groups
.
map
do
|
group
|
groups
=
current_user
.
authorized_groups
.
map
do
|
group
|
{
id:
group
.
id
,
text:
group
.
full_name
}
end
...
...
This diff is collapsed.
Click to expand it.
app/models/todo.rb
View file @
50c1a989
...
...
@@ -83,7 +83,7 @@ class Todo < ActiveRecord::Base
end
def
parent
project
||
group
project
end
def
unmergeable?
...
...
This diff is collapsed.
Click to expand it.
app/services/todo_service.rb
View file @
50c1a989
...
...
@@ -285,7 +285,6 @@ class TodoService
def
attributes_for_target
(
target
)
attributes
=
{
project_id:
target
&
.
project
&
.
id
,
group_id:
target
.
respond_to?
(
:group
)
?
target
.
group_id
:
nil
,
target_id:
target
.
id
,
target_type:
target
.
class
.
name
,
commit_id:
nil
...
...
This diff is collapsed.
Click to expand it.
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