Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'deploy-keys-load-async' into 'master' | Filipa Lacerda | 2017-05-04 | 1 | -4/+16 |
|\ | | | | | | | | | | | | | Deploy keys load async Closes #29667 See merge request !10973 | ||||
| * | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-05-04 | 10 | -53/+75 |
| |\ | |||||
| * \ | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-05-03 | 7 | -134/+69 |
| |\ \ | |||||
| * | | | Re-wrote to match our docs - still not 100% sure but closer than it was | Phil Hughes | 2017-04-28 | 1 | -2/+9 |
| | | | | |||||
| * | | | Merge branch 'master' into deploy-keys-load-async | Phil Hughes | 2017-04-28 | 3 | -9/+27 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/29667-deploy-keys' into ↵ | Jacob Schatz | 2017-04-27 | 1 | -2/+7 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | deploy-keys-load-async | ||||
| | * | | | | Project deploy keys json end point | Jarka Kadlecova | 2017-03-24 | 1 | -2/+7 |
| | | | | | | |||||
* | | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' | Sean McGivern | 2017-05-04 | 1 | -5/+23 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use blob viewer for job artifacts Closes #31297 See merge request !11018 | ||||
| * | | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewer | Douwe Maan | 2017-05-04 | 1 | -5/+23 |
| | | | | | | |||||
* | | | | | | Merge branch '12910-uploader-pers-snippet' into 'master' | Sean McGivern | 2017-05-04 | 1 | -24/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare uploaders for personal snippets comments See merge request !11022 | ||||
| * | | | | | | Support uploaders for personal snippets comments12910-uploader-pers-snippet | Jarka Kadlecova | 2017-05-02 | 1 | -24/+8 |
| | | | | | | | |||||
* | | | | | | | Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master' | Rémy Coutable | 2017-05-04 | 3 | -0/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable navigation to Pages config if Pages is disabled Closes #30529 See merge request !11008 | ||||
| * | | | | | | | Disable navigation to Pages config if Pages is disabled | Mark Fletcher | 2017-05-04 | 3 | -0/+6 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Regards project-level pages config - Nav link is now shown only if Pages is enabled for instance - Navigation to following controllers denied if Pages disabled: * projects/pages_controller * projects/pages_domains_controller - 'disabled' partial removed + Test for pages_controller introduced | ||||
* | | | | | | | Allow to create new branch and empty WIP merge request from issue page | Alfredo Sumaran | 2017-05-04 | 2 | -15/+40 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge branch 'dm-artifact-browser-header' into 'master' | Robert Speicher | 2017-05-03 | 1 | -2/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add breadcrumb, build header and pipelines submenu to artifacts browser See merge request !11050 | ||||
| * | | | | | | Add breadcrumb, build header and pipelines submenu to artifacts browser | Douwe Maan | 2017-05-03 | 1 | -2/+6 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'dm-link-discussion-to-outdated-diff' into 'master' | Sean McGivern | 2017-05-03 | 1 | -6/+9 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow commenting on older versions of the diff and comparisons between diff versions See merge request !10388 | ||||
| * | | | | | | | Allow commenting on older versions of the diff and comparisons between diff ↵dm-link-discussion-to-outdated-diff | Douwe Maan | 2017-05-03 | 1 | -6/+9 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | versions | ||||
* | | | | | | | Merge branch 'dm-blob-external-storage' into 'master' | Sean McGivern | 2017-05-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Blob support of external storage in preparation of job artifact blobs See merge request !11048 | ||||
| * | | | | | | | Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storage | Douwe Maan | 2017-05-03 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch ↵ | Robert Speicher | 2017-05-03 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28408-feature-proposal-include-search-options-to-pipelines-api' into 'master' Resolve "Feature Proposal: Include search options to pipelines API" Closes #28408 See merge request !9367 | ||||
| * | | | | | | - Add new parameters for Pipeline API | Shinya Maeda | 2017-05-03 | 1 | -5/+5 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | - Expand PipelinesFinder functions | ||||
* | | | | | | Merge branch 'async-milestone-tabs' into 'master' | Jacob Schatz | 2017-05-03 | 1 | -2/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | Load milestone tabs asynchronously See merge request !10919 | ||||
| * | | | | | Fixed feature spec not waiting for ajax request to finish | Phil Hughes | 2017-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixed 404 in project milestones when not logged in | ||||
| * | | | | | Load milestone tabs asynchronously | Phil Hughes | 2017-04-26 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'metrics-deployment-history' into 'master' | Douwe Maan | 2017-05-02 | 1 | -0/+18 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Metrics deployment history Closes #26914 See merge request !10649 | ||||
| * | | | | | | use represent_concise instead of separate entity | Pawel Chojnacki | 2017-04-24 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | DeploymentsSerializer can serialize arrays properly | Pawel Chojnacki | 2017-04-24 | 1 | -4/+3 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Pawel Chojnacki | 2017-04-20 | 27 | -300/+395 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 26914-add_deploy_history_data_source | ||||
| * | | | | | | | Optionally filter by deployment time | Pawel Chojnacki | 2017-03-28 | 1 | -3/+5 |
| | | | | | | | | |||||
| * | | | | | | | Use DeploymentSerializer to create deployment json | Pawel Chojnacki | 2017-03-28 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | Add endpoint that returns a list of deployments that happened within last ↵ | Pawel Chojnacki | 2017-03-28 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8.hours add index created_at | ||||
* | | | | | | | | Merge branch '12910-personal-snippets-notes-show' into 'master' | Sean McGivern | 2017-05-02 | 1 | -125/+14 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display comments for personal snippets See merge request !10974 | ||||
| * | | | | | | | | Display comments for personal snippets12910-personal-snippets-notes-show | Jarka Kadlecova | 2017-05-02 | 1 | -125/+14 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '19364-webhook-edit' into 'master' | Dmitriy Zaporozhets | 2017-05-02 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement ability to update hooks Closes #19364 See merge request !10816 | ||||
| * | | | | | | | | Implement ability to update hooks | Alexander Randa | 2017-04-28 | 1 | -0/+13 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Use blob viewers for snippets | Douwe Maan | 2017-04-30 | 2 | -6/+19 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Accept default branch param on notifaction services | Zeger-Jan van de Weg | 2017-04-28 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb" | Dosuken shinya | 2017-04-28 | 1 | -5/+10 |
| | | | | | | |||||
* | | | | | | Refactor overriding max size | Douwe Maan | 2017-04-27 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Add JSON endpoint to get simple blob viewer | Douwe Maan | 2017-04-27 | 1 | -2/+13 |
| | | | | | | |||||
* | | | | | | Use Blob methods instead of BlobHelper helpers | Douwe Maan | 2017-04-27 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Pass project to Blob | Douwe Maan | 2017-04-27 | 1 | -1/+1 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch '12910-personal-snippet-prep-2' into 'master' | Sean McGivern | 2017-04-26 | 1 | -14/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Support preview_markdown action for personal_snippets See merge request !10810 | ||||
| * | | | | Support preview_markdown action for personal_snippets | Jarka Kadlecova | 2017-04-26 | 1 | -14/+7 |
| | | | | | |||||
* | | | | | Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-url | Stan Hu | 2017-04-24 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'dz-refactor-create-members' into 'master' | Douwe Maan | 2017-04-20 | 1 | -24/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Refactor code that creates and destroys project/group members See merge request !10735 | ||||
| * | | | | Refactor members controller destroy action | Dmitriy Zaporozhets | 2017-04-17 | 1 | -12/+0 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Refactor controller code that creates project/group members | Dmitriy Zaporozhets | 2017-04-17 | 1 | -12/+0 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Refactor changing files in web UI | Douwe Maan | 2017-04-20 | 4 | -24/+15 |
| | | | |