James Lopez
303e9eb5bf
include contributions from forked projects on profile calendar
2016-02-22 15:46:29 +01:00
Jacob Schatz
5803a5308f
Merge branch 'issue_13463' into 'master'
...
Fix Side-by-side view after loading diff results
Fixes #13463
See merge request !2880
2016-02-22 14:35:06 +00:00
Phil Hughes
7bdddb481d
removed merge-request-no-votes css class
2016-02-22 11:50:26 +00:00
Phil Hughes
51c17329a4
Fixed failing issues tests
...
Removed up/down vote icons from merge requests. Was missed from d8069bd858
2016-02-22 11:35:52 +00:00
Phil Hughes
d8069bd858
Only show up or down votes icon on issue list if there are any
...
Closes #13649
2016-02-22 10:21:02 +00:00
Douglas Barbosa Alexandre
04d1b41258
Merge branch 'tasks' into 'master'
...
Add Todos
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2425
Tasks:
- Prepare database
- [X] Create a new table (`todos`)
- Tasks Queue view
- [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page
- [X] Add a chronological list of todos, with the 'Todos' tab active by default
- [X] Add a 'Done' button to each todo
- [x] Add filters (project, author, type, and action)
- Todos generation
- [X] When user issue/mr is assgined to someone
- [x] When user is mentioned on (issues/mr's/comments)
- Mark todo as `done`
- [X] When clicks on the 'Done' button
- [X] When edit issue/mr
- [X] When left/edit a comment
- [X] When reassign issue/mr
- [X] When add/remove labels to issue/mr
- [X] When issue/mr is closed
- [X] When mr is merged
- [X] When added an emoji
- [X] When changed the issue/mr milestone
* Screenshot:
See merge request !2817
2016-02-22 02:36:41 +00:00
Douwe Maan
28f9b54372
Merge branch 'merge-when-succeeded' into 'master'
...
Fix bugs in MergeWhenSucceeded
1. This fixes support for merge when succeeded for statuses without ref.
2. This fixes support for merge when succeeded for multiple stages. Stages are created after all builds for previous one are finished.
Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/9060 https://gitlab.com/gitlab-org/gitlab-ce/issues/8108 https://gitlab.com/gitlab-org/gitlab-ce/issues/12931 https://gitlab.com/gitlab-org/gitlab-ce/issues/13269
/cc @grzesiek @DouweM @rspeicher
See merge request !2894
2016-02-22 00:38:51 +00:00
Douglas Barbosa Alexandre
f37765efa2
Use before_action instead of before_filter
2016-02-21 12:52:37 -03:00
Jacob Schatz
1367caa642
Merge branch 'award-emoji-retina' into 'master'
...
Award emoji supports retina displays
Based on discussion in !2800
There is now a retina spritesheet for emojis. It is 2mb, don't know how big an issue that is.
Before:
After:
Also updated the rake task to make the @2x spritesheet https://gitlab.com/snippets/15348
cc\ @rspeicher @vsizov
See merge request !2891
2016-02-20 20:38:27 +00:00
Douwe Maan
42cbcb2347
"X assigned you Y" instead of "X assigned Y"
2016-02-20 12:01:55 -08:00
Douwe Maan
d53ae7f14d
Add "Mark all as done" button
2016-02-20 11:59:19 -08:00
Douwe Maan
57d16552ff
Include 'issue'/'merge request' in link
2016-02-20 11:53:15 -08:00
Douwe Maan
0e9775816a
Rename tab from 'Todos' to 'To do'
2016-02-20 11:52:57 -08:00
Yorick Peterse
e0cb3212ed
Flush emptiness caches whenever needed
...
This ensures that the emptiness cache (used for Repository#empty? and
Repository#has_visible_content?) is flushed after comitting changes
(using the web editor, API or Git) for new repositories. Once a
repository is no longer empty there's no need to explicitly flush the
cache for Repository#empty?. The cache for
Repository#has_visible_content? in turn is already flushed whenever
needed.
Fixes gitlab-org/gitlab-ce#13387
2016-02-20 20:17:50 +01:00
Douglas Barbosa Alexandre
f42b1fa6e5
Fix rubucop offenses
2016-02-20 13:10:37 -02:00
Douglas Barbosa Alexandre
3d52e139b1
Rename Tasks to Todos
2016-02-20 12:39:27 -02:00
Douglas Barbosa Alexandre
408e010d65
Rename IssuableBaseService#have_changes? to has_changes?
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
a7dee0ab01
Refactoring TasksHelper
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
d80678c0da
Improve tasks page list UI
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
ce78813c2a
Create or mark task pending as soon the action happens
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
a57bf9bd39
Rename menu item and page 'Task queue' to 'Tasks'
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
fc3f8a8ff7
Ensure that we only have one task per issue/mr
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
4465613647
Explicit mention of the assignee make a task
...
Since potentially the previous assign-task has already been handled.
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
424cb9ccae
💄 Cosmetic changes
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
7200989675
Refactoring task queue partials
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
8673a70f50
Improve formatted message for tasks when action is a mention
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
a74a69db68
Use destroy, in case we ever have before_destroy callbacks on Task
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
bc54300ce5
Fix task factory
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
139c513da6
Fix rubocop offenses
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
07eb334c25
Add filters by project, author, type, and action to task queue page list
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
c4c4b808f3
Add a link to Task Queue on dashboard sidebar
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
3b98adcc75
Create a pending task when a user is mentioned when edit a issue/mr/note
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
4120b7941d
Does not create a task if new assignee is the current user
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
1d476b0656
Create a pending task when a user is mentioned on a note
2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre
14fc05ebfd
Create a pending task when a user is mentioned on issue/mr
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
4bfc377ff6
Rename TaskService#mark_as_done to mark_pending_tasks_as_done
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
56a5fc0cd3
Move common behavior to to IssuableBaseService
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
372cdf4ce5
Marks pending tasks for an user as done when he merge the MR
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
c86b12bf69
Marks pending tasks for an user as done when he close the MR
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
7bed6ee21d
Marks pending tasks for an user as done when he edit a MR
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
802bf6d012
Create a pending task when an MR is assigned to someone
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
9da03c45c9
Mark pending tasks for the current user as done when he edit a note
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
49cd19652a
Mark pending tasks for the note author as done when he left a note
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
917081fe9d
Fix rubocop offenses
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
a56ada0a1e
Marks pending tasks for an user as done when he close the issue
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
e81061a211
Marks pending tasks for an user as done when he edit an issue
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
48ddf9a407
Remove task abilities, since we will only ever show the user their own
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
38026e5f77
Add pending tasks badge on top right next to the new and logout button
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
77d7910b8b
Allow user to mark each task as done manually
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
c8f2d18abd
Does not create a task for new issue when assignee is the current user
2016-02-20 12:10:26 -02:00
