Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Display issue state in issue links section of merge request widget33381-display-issue-state-in-mr-widget-issue-links | Adam Niedzielski | 2017-06-09 | 1 | -2/+14 |
| | |||||
* | Merge branch '3191-deploy-keys-update' into 'master' | Rémy Coutable | 2017-06-07 | 1 | -11/+3 |
|\ | | | | | | | | | | | | | Implement ability to update deploy keys Closes #3191 See merge request !10383 | ||||
| * | Implement ability to update deploy keys | Alexander Randa | 2017-06-02 | 1 | -11/+3 |
| | | |||||
* | | Use sum instead of map + inject | Adam Niedzielski | 2017-06-02 | 1 | -1/+1 |
| | | |||||
* | | Add Conversational Development Index page to admin panel | Taurie Davis, Simon Knox and Adam Niedzielski | 2017-06-01 | 1 | -0/+144 |
|/ | |||||
* | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos | Sean McGivern | 2017-05-12 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | 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. | ||||
* | Merge request widget redesign | Fatih Acet | 2017-05-09 | 1 | -0/+168 |
| | |||||
* | Merge remote-tracking branch 'origin/29667-deploy-keys' into ↵ | Jacob Schatz | 2017-04-27 | 1 | -0/+11 |
|\ | | | | | | | deploy-keys-load-async | ||||
| * | Project deploy keys json end point | Jarka Kadlecova | 2017-03-24 | 1 | -0/+11 |
| | | |||||
* | | Also track auto-cancelling in jobs, detail: | Lin Jen-Shin | 2017-04-06 | 2 | -3/+5 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | Add test for presenters | Lin Jen-Shin | 2017-04-06 | 1 | -4/+0 |
| | | |||||
* | | Fix test and only show job status title if it's | Lin Jen-Shin | 2017-04-05 | 1 | -0/+6 |
| | | | | | | | | cancelled and the pipeline is auto-cancelled. | ||||
* | | rename pipeline_presenter | Rydkin Maxim | 2017-04-04 | 1 | -1/+1 |
| | | |||||
* | | remove redundant `pipeline` | Rydkin Maxim | 2017-04-04 | 1 | -1/+1 |
| | | |||||
* | | add presenter for status badge | Rydkin Maxim | 2017-04-04 | 1 | -0/+13 |
|/ | |||||
* | Added delegations to comply with the new rubocop rules | Jose Ivan Vargas | 2017-03-06 | 1 | -12/+3 |
| | | | | | Also fixed the deploy_keys view and moved the code from the repository_helper to the repository_controller | ||||
* | Added tests for the repository_controller and repository_helper | Jose Ivan Vargas | 2017-03-06 | 1 | -0/+4 |
| | | | | | | | | 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 | ||||
* | Introduced the deploy keys presenter | Grzegorz Bizon | 2017-03-06 | 1 | -0/+65 |
| | |||||
* | Don't override presentee methods for Gitlab::View::Presenter::Delegated | Rémy Coutable | 2017-01-24 | 1 | -3/+3 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | More improvements to presenters23563-document-presenters | Rémy Coutable | 2017-01-18 | 4 | -28/+19 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Fix typos and improve presenters documentation | Rémy Coutable | 2017-01-18 | 1 | -39/+28 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Improve presenter architecture | Rémy Coutable | 2017-01-18 | 4 | -20/+24 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Document presenters | Rémy Coutable | 2017-01-18 | 3 | -0/+185 |
Signed-off-by: Rémy Coutable <remy@rymai.me> |