Commit graph

23 commits

Author SHA1 Message Date
Adam Niedzielski
4bfd06e60e Display issue state in issue links section of merge request widget 2017-06-09 10:21:56 +02:00
Rémy Coutable
ee0e3ffc05 Merge branch '3191-deploy-keys-update' into 'master'
Implement ability to update deploy keys

Closes #3191

See merge request !10383
2017-06-07 14:37:50 +00:00
Alexander Randa
3d70eeb5bb Implement ability to update deploy keys 2017-06-02 19:44:36 +03:00
Adam Niedzielski
ea8381411b Use sum instead of map + inject 2017-06-02 17:17:24 +02:00
Taurie Davis, Simon Knox and Adam Niedzielski
26dde5f55f Add Conversational Development Index page to admin panel 2017-06-01 17:37:21 +02:00
Sean McGivern
ad2bfeb857 Fix conflict resolution from corrupted upstream
I don't know why this happens exactly, but given an upstream and fork repository
from a customer, both of which required GC, resolving conflicts would corrupt
the fork so badly that it couldn't be cloned.

This isn't a perfect fix for that case, because the MR may still need to be
merged manually, but it does ensure that the repository is at least usable.

My best guess is that when we generate the index for the conflict
resolution (which we previously did in the target project), we obtain a
reference to an OID that doesn't exist in the source, even though we already
fetch the refs from the target into the source.

Explicitly setting the source project as the place to get the merge index from
seems to prevent repository corruption in this way.
2017-05-12 20:47:51 +01:00
Fatih Acet
0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00
Jacob Schatz
57f8be4e69 Merge remote-tracking branch 'origin/29667-deploy-keys' into deploy-keys-load-async 2017-04-27 16:40:27 -04:00
Lin Jen-Shin
057c0d7a5c Also track auto-cancelling in jobs, detail:
Not only tracking auto-cancelling in pipelines,
we'll also track this in jobs because pipelines
could be retried and the information would get lost
when this happened. Also erase auto-cancelling
relation for pipelines when they're retried.
2017-04-06 21:32:56 +08:00
Lin Jen-Shin
e258e6f147 Add test for presenters 2017-04-06 03:10:52 +08:00
Lin Jen-Shin
34eea29511 Fix test and only show job status title if it's
cancelled and the pipeline is auto-cancelled.
2017-04-05 23:33:19 +08:00
Rydkin Maxim
14722b66a1 rename pipeline_presenter 2017-04-04 21:11:25 +03:00
Rydkin Maxim
86d8c2a78e remove redundant pipeline 2017-04-04 21:11:25 +03:00
Rydkin Maxim
63dbdb9f52 add presenter for status badge 2017-04-04 21:11:25 +03:00
Jarka Kadlecova
e0dc73527a Project deploy keys json end point 2017-03-24 11:53:47 +01:00
Jose Ivan Vargas
43958926c5 Added delegations to comply with the new rubocop rules
Also fixed the deploy_keys view and moved the code from the repository_helper
to the repository_controller
2017-03-06 09:47:44 -06:00
Jose Ivan Vargas
a29517dd0c Added tests for the repository_controller and repository_helper
Added specs for the deploy_keys_presenter and added a new method in the presenter
called #key_available?

Fixed some minor UX inconsistencies and added a concern to handle
redirection
2017-03-06 09:47:44 -06:00
Grzegorz Bizon
5967c17e80 Introduced the deploy keys presenter 2017-03-06 09:47:44 -06:00
Rémy Coutable
0ac65b6cc3 Don't override presentee methods for Gitlab::View::Presenter::Delegated
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-24 10:24:47 +01:00
Rémy Coutable
061bb6eb6e More improvements to presenters
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-18 16:38:35 +01:00
Rémy Coutable
e950830ba6 Fix typos and improve presenters documentation
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-18 16:38:34 +01:00
Rémy Coutable
bf789ff567 Improve presenter architecture
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-18 16:38:34 +01:00
Rémy Coutable
b4f67cc229 Document presenters
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-18 16:38:34 +01:00