summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed tests for issue boards & diff note resolvingvue2Phil Hughes2016-11-102-2/+2
|
* Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-104-27/+17
|
* Changed how lists get sortedPhil Hughes2016-11-103-2/+6
|
* Issue board spec fixesPhil Hughes2016-11-103-2/+4
|
* Fixed jump to discussion button not showingPhil Hughes2016-11-101-1/+5
|
* Changed how resolving notes is renderedPhil Hughes2016-11-104-35/+39
| | | | Vue2 was taking the template out & then appending again. This changes that
* Remove unnecesarry require.Fatih Acet2016-11-101-1/+0
|
* Fixed up resolve discussionsPhil Hughes2016-11-108-27/+43
|
* Refactor of issue boards to work with Vue2Phil Hughes2016-11-1016-234/+225
|
* VueJSMigration: Remove parallel-conflict-line component.Fatih Acet2016-11-103-20/+11
| | | | It's because Vue says: "Component template should contain exactly one root element".
* Vue migration fix syntax highlighting.Fatih Acet2016-11-101-1/+1
|
* VueJS migration, replace {{{ with v-htmlFatih Acet2016-11-102-5/+3
|
* Migrate Vue v1 to v2.Fatih Acet2016-11-109-21/+23
|
* Bump up vue version.Fatih Acet2016-11-102-9232/+6672
|
* Merge branch 'grapify-token-api' into 'master' Rémy Coutable2016-11-102-47/+31
|\ | | | | | | | | | | | | | | | | Grapify triggers API ## What are the relevant issue numbers? Related to #22928 See merge request !7378
| * Grapify token APIRobert Schilling2016-11-102-47/+31
| |
* | Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into ↵Douwe Maan2016-11-104-7/+62
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error when using invalid branch name when creating a new pipeline ## What does this MR do? This MR fixes `500` error when creating a new pipeline though user interface ("Run pipeline") ## Are there points in the code the reviewer needs to double check? Is this a good approach to catch those exceptions on `Repository` level? ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #23982 See merge request !7324
| * | Remove redundant rescue from repository keep_aroundfix/error-when-invalid-branch-for-new-pipeline-usedGrzegorz Bizon2016-11-091-5/+1
| | |
| * | Remove redundant space from repository model codeGrzegorz Bizon2016-11-091-1/+1
| | |
| * | Add Changelog entry for new pipeline fixGrzegorz Bizon2016-11-071-0/+4
| | |
| * | Evade some exceptions when using invalid referencesGrzegorz Bizon2016-11-072-1/+54
| | |
| * | Improve code readability in pipelines controllerGrzegorz Bizon2016-11-071-1/+3
| | |
* | | Merge branch 'fix-cache-for-commit-status' into 'master' Rémy Coutable2016-11-102-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cache for commit status in commits list to respect branches Fix cache for commit status in commits list to respect branches Closes #24324 See merge request !7372
| * | | Fix cache for commit status in commits list to respect branchesLin Jen-Shin2016-11-102-1/+5
| | | |
* | | | Merge branch 'forking-in-progress-title' into 'master' Sean McGivern2016-11-102-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use 'Forking in progress' title when appropriate See merge request !7394
| * | | | Use 'Forking in progress' title when appropriatePhilip Karpiak2016-11-092-1/+5
| | |_|/ | |/| |
* | | | Merge branch '23945-improve-ee_compat_check-task-part-3' into 'master' Robert Speicher2016-11-103-83/+110
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve ee_compat_check task (part 3)" Improve the `ee_compat_check` task with caching and keep artifacts on failure. Closes #23945. See merge request !7177
| * | | | Improve EeCompatCheck, cache EE repo and keep artifacts for the ↵23945-improve-ee_compat_check-task-part-3Rémy Coutable2016-11-103-83/+110
| |/ / / | | | | | | | | | | | | | | | | | | | | ee_compat_check task Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '23502-import-university-training-preso-slides' into 'master' Achilleas Pipinellis2016-11-1027-0/+1383
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import University training preso slides ## What does this MR do? Adds missing training material from University. ## What are the relevant issue numbers? Closes #23502 See merge request !7016
| * | | | Added training material23502-import-university-training-preso-slidesSean Packham2016-10-2027-0/+1383
| | | | |
* | | | | Merge branch 'grapify-milestone-api' into 'master' Rémy Coutable2016-11-102-54/+66
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify milestones API ## What are the relevant issue numbers? Related to #22928 See merge request !7373
| * | | | Grapify milestones APIgrapify-milestone-apiRobert Schilling2016-11-102-54/+66
| | |_|/ | |/| |
* | | | Merge branch 'grapify-runners-api' into 'master' Rémy Coutable2016-11-102-55/+66
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify runners API ## What are the relevant issue numbers? Related to #22928 See merge request !7377
| * | | | Grapify runners APIRobert Schilling2016-11-102-55/+66
| |/ / /
* | | | Merge branch 'grapify-session-api' into 'master' Rémy Coutable2016-11-102-17/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the session API ## What are the relevant issue numbers? Related to #22928 See merge request !7381
| * | | | Grapify the session APIgrapify-session-apiRobert Schilling2016-11-092-17/+18
| |/ / /
* | | | Merge branch 'feature/api_owned_resource' into 'master' Sean McGivern2016-11-105-0/+65
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Add api endpoint `/groups/owned` See merge request !7103
| * | | Added API endpoint groups/ownedBorja Aparicio2016-11-084-0/+41
| | | |
| * | | Added API spec test for projects/owned endpointBorja Aparicio2016-11-081-0/+24
| | | |
* | | | Fix CHANGELOG after 8.14.0-rc1 tagAlejandro Rodríguez2016-11-091-3/+0
| | | |
* | | | Update CHANGELOG.md for 8.14.0-rc1Alejandro Rodríguez2016-11-0932-126/+34
| | | | | | | | | | | | [ci skip]
* | | | Fix YAML syntax on CHANGELOG entryAlejandro Rodríguez2016-11-091-1/+1
| | | |
* | | | Merge branch '24341-fix-failure' into 'master' Stan Hu2016-11-092-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove order-dependent expectation Fixes #24341, hopefully See merge request !7385
| * | | | Remove order-dependent expectation24341-fix-failureRémy Coutable2016-11-092-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'rs-doc-highlighting' into 'master' Achilleas Pipinellis2016-11-093-15/+15
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more highlighting to development docs Now that docs.gitlab.com has lovely highlighting, we should make sure we use it everywhere it makes sense! See merge request !7369
| * | | | Add more highlighting to Shell Commands docrs-doc-highlightingRobert Speicher2016-11-091-4/+4
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Add more highlighting to Instrumentation docRobert Speicher2016-11-091-5/+5
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Add more highlighting to Migration Style Guide docRobert Speicher2016-11-091-6/+6
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch '23731-add-param-to-user-api' into 'master' Sean McGivern2016-11-094-1/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add query param to filter users by 'external' & 'blocked' type on API Closes #23731 See merge request !7109
| * | | | | Add query param to filter users on 'external' & 'blocked' type on APIYatish Mehta2016-11-084-1/+45
| | | | | |