Commit Graph
2917 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre 28097398c5 Does not raise an error when Todo is already marked as done 2016-02-23 10:43:29 -03:00
Rémy Coutable 96ed5c5114 Ensure we don't check a commit's description for revert message if it has no description 2016-02-22 18:33:02 +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
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
Douwe Maan 42cbcb2347 "X assigned you Y" instead of "X assigned Y" 2016-02-20 12:01:55 -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 3d52e139b1 Rename Tasks to Todos 2016-02-20 12:39:27 -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 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 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 77d7910b8b Allow user to mark each task as done manually 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 7cafa2ce92 Add tasks queue list page 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 41d8f5649e Add task model 2016-02-20 12:10:26 -02:00
Douwe Maan 31682eb987 Merge branch 'visibletrap/gitlab-ce-label' 2016-02-19 17:54:13 -08:00
Douwe Maan 3a97a5ddfd Merge branch 'rs-blob' into 'master'
Add a `Blob` model that wraps `Gitlab::Git::Blob`

This allows us to take advantage of Rails' `to_partial_path` to render
the correct partial based on the Blob type, rather than cluttering the
view with conditionals.

It also allows (and will allow in the future) better encapsulation for
Blob-related logic which makes sense for our Rails app but might not
make as much sense for the core `gitlab_git` library, such as detecting
if the blob is an SVG.

See merge request !2887
2016-02-20 01:12:52 +00:00
Douwe Maan c352aaa008 Merge branch '12792-emoji-as-text-diff-comment' 2016-02-19 16:59:36 -08:00
Kamil Trzcinski 56449cc674 Fix Merge When Succeeded for multiple stages
Use around_transition to trigger build creation for next stages
2016-02-19 23:24:31 +01:00
Jacob Schatz de84fa365e Merge branch 'issue_3276' into 'master'
Labels should be visible in milestone view

Closes #3276 

See merge request !2599
2016-02-19 19:44:13 +00:00
Kamil Trzciński bcc2332061 Merge branch 'commit-status-fix' into 'master'
Fix missing ignored? for GenericCommitStatus

This is pretty important fix. We should not release 8.5 without this.

It critical error when handling GenericCommitStatus:
```
undefined method `ignored?' for #<GenericCommitStatus:0x007fe1a2a20fe0>
```

cc @grzesiek 


See merge request !2899
2016-02-19 19:22:25 +00:00
Kamil Trzcinski aa812dbfcc Fix missing ignored? for GenericCommitStatus 2016-02-19 19:58:43 +01:00
Rubén DávilaandRobert Speicher 5ef3f80d41 More updates from the last code review. 2016-02-19 13:15:42 -05:00
Rubén DávilaandRobert Speicher 28aaef24ad Don't use self when looking for cross-references! 2016-02-19 13:14:55 -05: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 d958d027dc Make #commit_with_hooks return the new obj id plus some other fixes. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher d34733efc4 Don't show revert button if commit/MR has already been reverted. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher a07021fa8e Make more robust the test to see if a commit has been previously reverted. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher be54ba33ed Refactor commit message for revert commit. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher 02f48053f1 No longer need to ignore temporary branch.
* Now it's only created when user choose to create a MR and
  logic to hide it is handled by https://gitlab.com/gitlab-org/gitlab-ce/blob/50595af7b0e304f16e2955109abd2d25cd96efda/app/helpers/application_helper.rb#L139
2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher f088caca3b Use a reference to the MR when reverting MRs. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher b8295fc323 Fix build and add specs 2016-02-19 13:14:53 -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 328b52d58a Some updates after last code review. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 38e708f0ce Add link to fork if user can't revert MR. 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 38752d159d Remove no longer required methods on MR. 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 ef591b87d1 Fix commit message plus other little fix. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher b0693318c3 Show list of branches plus some fixes. 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 b6fe51b901 Some updates from last code review. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 1708e1fc03 Create branch if it doesn't exists. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher df5f362c34 Add some specs plus some refactor. 2016-02-19 13:14:50 -05:00