Commit graph

18 commits

Author SHA1 Message Date
Robert Speicher
c1743ba4c4 Use a project factory with a repository where necessary 2017-01-25 14:52:12 -05:00
Rodolfo Santos
1db9f826c1 Add setting to only allow merge requests to be merged when all discussions are resolved
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04 14:58:40 +01:00
Douglas Barbosa Alexandre
8522ef44bf Recreates missing group labels when moving project to another group 2016-10-19 14:58:24 -02:00
Jeroen van Baarsen
f1479b56b7
Remove the annotate gem and delete old annotations
In 8278b763d9 the default behaviour of annotation
has changes, which was causing a lot of noise in diffs. We decided in #17382
that it is better to get rid of the whole annotate gem, and instead let people
look at schema.rb for the columns in a table.

Fixes: #17382
2016-05-09 18:00:28 +02:00
Pierre de La Morinerie
18295585d9 Fix MergeRequest#source_sha when there is no diff
`MergeRequest#source_sha` is expected to return the sha of the source
branch last commit.

But when a open Merge Request has no diff (e.g. all commits have already
been merged to the target branch), `merge_request.source_sha`
incorrectly returns `nil`.

This was un-noticed before – but now that !2217 has been merged,
it makes `Gitlab::Git::Commit.between` raise an
"Unexpected nil argument" exception.

This fixes the crash, by making sure that `source_sha` returns a
correct result even when there is no diff available.
2016-03-16 14:02:04 +01:00
Rémy Coutable
e632bd26e4 Fixes "iid of max iid" in Issuable sidebar for merged MR
Fixes #13928
2016-03-08 16:23:20 +01:00
Pierre de La Morinerie
543845f7ef Indicate how much an MR branch diverges from the target branch 2016-03-03 15:11:44 +01:00
Rubén Dávila
f56ee9d3b9 Save merge commit id when MR is merged 2016-02-19 13:14:49 -05:00
Stan Hu
79c0e7212a Annotate models 2016-01-06 13:09:55 +00:00
Zeger-Jan van de Weg
2462a96e45 Incorporate feedback 2015-12-05 15:42:38 +01:00
Dmitriy Zaporozhets
a237999f00
Annotate models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13 19:22:46 +01:00
Stan Hu
d7812a95cf Re-annotate models 2015-09-06 07:48:48 -07:00
Robert Speicher
0716a559b5 Fix Style/AsciiComments cop violation 2015-06-22 14:43:51 -04:00
Stan Hu
7e204cf389 Added comment notification events to HipChat and Slack services.
Supports four different event types all bundled under the "note" event type:

- comments on a commit
- comments on an issue
- comments on a merge request
- comments on a code snippet
2015-03-06 06:54:00 -08:00
Dmitriy Zaporozhets
98ee4a1fa7 Annotate models 2015-01-22 09:40:03 -08:00
Dmitriy Zaporozhets
92deb451da
Annotate models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-25 12:25:02 +03:00
Dmitriy Zaporozhets
8f1e60b057
Fix satellite tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-06 09:52:56 +03:00
Dmitriy Zaporozhets
5a68c20fba
Fix MR factory and some MR tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 18:07:24 +03:00