Commit Graph
742 Commits
Author SHA1 Message Date
Kamil Trzcinski 7c288c07f1 Check the HEAD of branch when doing Merge When Succeeded 2016-02-22 10:34:09 +01: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:

![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png)

See merge request !2817
2016-02-22 02:36:41 +00: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 ce78813c2a Create or mark task pending as soon the action happens 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 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 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 c8f2d18abd Does not create a task for new issue when assignee is the current user 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 422a01fc85 Create a pending task when an issue is assigned to someone 2016-02-20 12:10:26 -02:00
Kamil Trzcinski 6febe1007e Discover branches for commit statuses ref-less when doing merge when succeeded 2016-02-19 23:24:31 +01:00
Rubén DávilaandRobert Speicher 169070ba4b Some updates from last code review. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher 6908663479 Refactor RevertService. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher 2ea5b37f2e Some fixes and refactors for code related to forks. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 11345866d8 Don't make Repository#revert aware of MRs. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher a28eef1d1a Update copy and URLs used when reverting MRs. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher e22cdb40ec Big refactor for #revert_commit.
* Now checking if a commit is already reverted or there is a conflict is
  much more faster.
* No longer need to create a new branch.
2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 6b0e478353 Some fixes required for conflicts on revert. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 91e6e32d13 Make it work for merge commits. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher b36319a17c Make MRs with revert commit work. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 8061399368 Add RevertService class with basic logic to revert commit 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 5bb5019e04 Use adequate description for new MR. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher f56ee9d3b9 Save merge commit id when MR is merged 2016-02-19 13:14:49 -05:00
Kamil Trzciński c0f549a95b Merge branch 'fix/ci-first-job-allow-failure' into 'master'
Fix CI builds scheduler when first build in stage is allowed to fail

This fixes an edge case in CI builds scheduler when first build in stage was marked as allowed to fail.

Closes #3192

See merge request !2869
2016-02-18 14:28:25 +00:00
Douwe Maan 52a8d1f3c6 Merge branch 'fix/gitpushservice-complexity-issue' into 'master'
Reduce code complexity on GitPushService#execute

Code complexity for gitlab-ce after this has been refactored:
```
  27.3: GitPushService#execute
```
This still needs to be merged into `gitlab-ee` presumably with conflicts... Perhaps we should create another issue for doing that?

I left the code sort of similar to what it was... If I could, I would have refactored most of the code into separate classes, etc. as it breaks probably all SOLID principles.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13327


See merge request !2784
2016-02-18 09:33:21 +00:00
Grzegorz Bizon 364072b7d0 Return a builds array in builds create service 2016-02-18 10:29:20 +01:00
Jacob Vosmaer 64d8a38b54 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor 2016-02-17 15:25:57 +01:00
Yorick Peterse b1203108b0 Flush all repository caches when deleting a repo
This ensures that _all_ caches (including any caches normally only
flushed under certain conditions) are flushed whenever a project is
removed. Because cache keys are based on project namespaces (excluding
IDs) not doing so could result in a newly created project re-using old
caches (if the project was re-created using the same name).
2016-02-17 11:38:18 +01:00
Jacob Vosmaer a0ccb0731b Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor 2016-02-17 11:30:42 +01:00
James Lopez 5255a54df9 refactored some stuff based on MR feedback 2016-02-17 10:42:59 +01:00
Douwe Maan 42d088fcb1 Merge branch 'fix/cross-reference-notes-forks' into 'master'
Fix cross reference notes  on forks

Updates `cross_reference_exists?` to match on commit only.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/5849

See merge request !2731
2016-02-16 11:47:46 +00:00
James Lopez 11913a762a updated system note service and spec based on feedback 2016-02-16 09:01:56 +01:00
James Lopez 20e79f714a refactored GitPushService and updated spec 2016-02-15 15:51:00 +01:00
Douwe Maan 31c8dbc96f Merge branch 'fix-duplicate-hook-notifications' into 'master'
Fix duplicated branch creation/deletion Web hooks/service notifications when using Web UI

Similar to 423d2d6, except duplicates occurred only if a Web service (e.g. Slack) were
configured.

When deleting a branch, this is what was happening:

    1. DeleteBranchService calls execute_hooks and execute_services
    2. The call to repository.rm_branch triggers the GitHooksService.
    3. This, in turn, calls GitPushService and then calls the same hooks/services again.

5145706 now makes it no longer necessary for DeleteBranchService and CreateBranchService to execute
the branch hooks/services. Note that tags behave differently in GitTagPushService and GitPushService
is not called.

Closes #10330

See merge request !2763
2016-02-12 18:11:01 +00:00
James Lopez 4089be8fed woo hoo - getting there with the cross-reference issue. Should fix the problem and updated spec 2016-02-12 18:01:47 +01:00
James Lopez a5b011c9d8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-reference-notes-forks 2016-02-12 12:21:04 +01:00