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
Douglas Barbosa Alexandre
422a01fc85
Create a pending task when an issue is assigned to someone
2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre
1e0053f2dc
Fix task queue list page title
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
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
Robert Speicher
a5c7aea3a9
Merge branch 'issue_3409' into 'master'
...
Add ability to revert changes introduced by Merge Requests or Commits
Closes #3409
See merge request !1990
2016-02-19 18:39:31 +00:00
Rémy Coutable
803d6f8f05
Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master'
...
Consistency in MR and issue header.
Fixes : #13550
See merge request !2874
2016-02-19 18:21:42 +00:00
Rubén Dávila and Robert Speicher
cc5ff3b5a4
Use the adequate success path on the JSON endpoint.
...
I forgot to update this and some spinach specs were failing.
2016-02-19 13:15:43 -05:00
Rubén Dávila and Robert Speicher
5ef3f80d41
More updates from the last code review.
2016-02-19 13:15:42 -05:00
Rubén Dávila and Robert Speicher
28aaef24ad
Don't use self when looking for cross-references!
2016-02-19 13:14:55 -05:00
Rubén Dávila and Robert Speicher
169070ba4b
Some updates from last code review.
2016-02-19 13:14:54 -05:00
Rubén Dávila and Robert Speicher
6908663479
Refactor RevertService.
2016-02-19 13:14:54 -05:00
Rubén Dávila and Robert 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ávila and Robert 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ávila and Robert Speicher
e8d15f1339
Refactor revert_commit_link helper.
2016-02-19 13:14:54 -05:00
Rubén Dávila and Robert 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ávila and Robert Speicher
be54ba33ed
Refactor commit message for revert commit.
2016-02-19 13:14:54 -05:00
Rubén Dávila and Robert 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ávila and Robert Speicher
f088caca3b
Use a reference to the MR when reverting MRs.
2016-02-19 13:14:53 -05:00
Rubén Dávila and Robert Speicher
5ad78cdbda
Use a custom title in the revert modal.
2016-02-19 13:14:53 -05:00
Rubén Dávila and Robert Speicher
b8295fc323
Fix build and add specs
2016-02-19 13:14:53 -05:00
Rubén Dávila and Robert Speicher
ccd2a8d6b5
Show a tooltip on revert link.
2016-02-19 13:14:53 -05:00
Rubén Dávila and Robert Speicher
477ae66b4d
Move revert link to the MR widget section plus some refactor.
2016-02-19 13:14:53 -05:00
Rubén Dávila and Robert Speicher
2ea5b37f2e
Some fixes and refactors for code related to forks.
2016-02-19 13:14:53 -05:00
Rubén Dávila and Robert Speicher
11345866d8
Don't make Repository#revert aware of MRs.
2016-02-19 13:14:52 -05:00
Rubén Dávila and Robert Speicher
328b52d58a
Some updates after last code review.
2016-02-19 13:14:52 -05:00
Rubén Dávila and Robert Speicher
38e708f0ce
Add link to fork if user can't revert MR.
2016-02-19 13:14:52 -05:00
Rubén Dávila and Robert Speicher
9d4c105ab0
Remove code introduced when endpoint was in MR controller.
2016-02-19 13:14:52 -05:00
Rubén Dávila and Robert Speicher
a28eef1d1a
Update copy and URLs used when reverting MRs.
2016-02-19 13:14:52 -05:00
Rubén Dávila and Robert Speicher
38752d159d
Remove no longer required methods on MR.
2016-02-19 13:14:52 -05:00
Rubén Dávila and Robert Speicher
1469b72c46
Check that target_branch is present.
2016-02-19 13:14:51 -05:00
Rubén Dávila and Robert 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ávila and Robert Speicher
4dc8350517
Reuser revert commit modal in MR detail page.
2016-02-19 13:14:51 -05:00
Rubén Dávila and Robert Speicher
ef591b87d1
Fix commit message plus other little fix.
2016-02-19 13:14:51 -05:00
Rubén Dávila and Robert Speicher
b0693318c3
Show list of branches plus some fixes.
2016-02-19 13:14:51 -05:00
Rubén Dávila and Robert Speicher
6b0e478353
Some fixes required for conflicts on revert.
2016-02-19 13:14:51 -05:00
Rubén Dávila and Robert Speicher
91e6e32d13
Make it work for merge commits.
2016-02-19 13:14:51 -05:00
Rubén Dávila and Robert Speicher
b36319a17c
Make MRs with revert commit work.
2016-02-19 13:14:50 -05:00
Rubén Dávila and Robert Speicher
8061399368
Add RevertService class with basic logic to revert commit
2016-02-19 13:14:50 -05:00
Rubén Dávila and Robert Speicher
34e26b8212
Add button to revert commit on Commit detail page.
2016-02-19 13:14:50 -05:00
Rubén Dávila and Robert Speicher
006089f972
Add new endpoint and button to revert any commit.
2016-02-19 13:14:50 -05:00
Rubén Dávila and Robert Speicher
b6fe51b901
Some updates from last code review.
2016-02-19 13:14:50 -05:00
