summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 'fix-karma-coverage' into 'master'"revert-135b4f75Clement Ho2017-02-072-10/+1
| | | This reverts merge request !9044
* Merge branch 'route-map-string-source' into 'master' Douwe Maan2017-02-073-31/+41
|\ | | | | | | | | Support a string source in the route map See merge request !9046
| * Use stricter regex anchorsroute-map-string-sourceDouwe Maan2017-02-071-1/+1
| |
| * Support a string source in the route mapDouwe Maan2017-02-073-31/+41
| |
* | Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master' Fatih Acet2017-02-0711-25/+52
|\ \ | | | | | | | | | | | | Fix rendering pipelines for a new merge request See merge request !9032
| * | fix lint errorMike Greiling2017-02-071-1/+1
| | |
| * | Remove changelog entry; Changes after reviewFilipa Lacerda2017-02-072-5/+1
| | |
| * | fix broken frontend testsMike Greiling2017-02-073-13/+9
| | |
| * | Fix merge request controller specs for new actionfix/gb/invalid-new-merge-request-apiGrzegorz Bizon2017-02-071-1/+7
| | |
| * | Fix broken specs from the Frontend sideFilipa Lacerda2017-02-073-7/+8
| | |
| * | Update _pipelines.html.hamlKamil Trzciński2017-02-071-1/+1
| | |
| * | Add Changelog entry for new merge request pipelines fixGrzegorz Bizon2017-02-071-0/+4
| | |
| * | Add feature spec for a new merge request with pipelineGrzegorz Bizon2017-02-071-0/+20
| | |
| * | Fix rendering pipelines for a new merge requestGrzegorz Bizon2017-02-072-3/+5
| | |
| * | Pass proper endpoint path to MR pipelines partialGrzegorz Bizon2017-02-071-1/+3
| | |
* | | Merge branch 'improve-handleLocationHash-tests' into 'master' Filipa Lacerda2017-02-072-4/+29
|\ \ \ | | | | | | | | | | | | | | | | Improve gl.utils.handleLocationHash tests See merge request !9040
| * | | Improve gl.utils.handleLocationHash testsimprove-handleLocationHash-testsClement Ho2017-02-072-4/+29
| | | |
* | | | Merge branch 'fix-droplab-rendering' into 'master' Alfredo Sumaran2017-02-071-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix droplab rendering template when data-dynamic selector is unavailable Closes gitlab-ee#1655 See merge request !9012
| * | | Fix droplab rendering template when data-dynamic selector is unavailablefix-droplab-renderingClement Ho2017-02-061-2/+2
| | | |
* | | | Merge branch ↵Alfredo Sumaran2017-02-0710-75/+238
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '23785-with-builds-tab-gone-give-additional-context-in-system-information-element-in-mr-commit-views-by-adding-mini-pipeline-graph' into 'master' added inline pipeline graph Closes #23785 See merge request !8576
| * | | | added inline pipeline graph23785-with-builds-tab-gone-give-additional-context-in-system-information-element-in-mr-commit-views-by-adding-mini-pipeline-graphLuke "Jared" Bennett2017-02-0710-75/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests review changes
* | | | | Merge branch 'fix-karma-coverage' into 'master' Clement Ho2017-02-072-1/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix javascript coverage reports See merge request !9044
| * | | | | fix karma coverage reportMike Greiling2017-02-072-1/+10
| | |_|/ / | |/| | |
* | | | | Merge branch 'route-map' into 'master' Robert Speicher2017-02-0738-157/+815
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867
| * | | | | Move permission check before more expensive checksroute-mapDouwe Maan2017-02-071-3/+5
| | | | | |
| * | | | | Use described_class over literal class nameDouwe Maan2017-02-071-11/+11
| | | | | |
| * | | | | Don't skip authorization when stopping CI environmentsDouwe Maan2017-02-072-8/+4
| | | | | |
| * | | | | Address feedbackDouwe Maan2017-02-0622-200/+238
| | | | | |
| * | | | | Update outdated specDouwe Maan2017-02-061-2/+0
| | | | | |
| * | | | | CI is fine with lookup errorsDouwe Maan2017-02-061-1/+1
| | | | | |
| * | | | | Update changelogDouwe Maan2017-02-061-1/+1
| | | | | |
| * | | | | Add documentationDouwe Maan2017-02-063-0/+37
| | | | | |
| * | | | | No || neededDouwe Maan2017-02-061-1/+1
| | | | | |
| * | | | | Add feature specsDouwe Maan2017-02-068-39/+147
| | | | | |
| * | | | | Tweak test to verify there are no duplicatesDouwe Maan2017-02-061-2/+2
| | | | | |
| * | | | | Improve performance of finding last deployed environmentDouwe Maan2017-02-0615-119/+66
| | | | | |
| * | | | | Add testsDouwe Maan2017-02-0616-6/+381
| | | | | |
| * | | | | Validate route mapDouwe Maan2017-02-063-13/+58
| | | | | |
| * | | | | Fix XSS issue by not using URI.joinDouwe Maan2017-02-061-2/+1
| | | | | |
| * | | | | Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-0618-16/+129
| | | | | |
* | | | | | Merge branch '26908-add-foreign-keys-to-timelogs' into 'master' Rubén Dávila Santos2017-02-0711-10/+171
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use normal associations instead of polymorphic Closes #26908 See merge request !8769
| * | | | | | Refactor migration to not require downtime26908-add-foreign-keys-to-timelogsRuben Davila2017-02-074-12/+76
| | | | | | |
| * | | | | | Use normal associations instead of polymorphic.Ruben Davila2017-02-079-9/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't properly use foreign keys on columns that are configured for polymorphic associations which has disadvantages related to data integrity and storage. Given we only use time tracking for Issues and Merge Requests we're moving to the usage of regular associations.
* | | | | | | Merge branch '27352-search-label-filter-header' into 'master' Annabel Dunstone Gray2017-02-073-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27352 Update label dropdown titles for bulk edits Closes #27352 See merge request !8852
| * | | | | | | 27352-search-label-filter-header27352-search-label-filter-headertauriedavis2017-02-033-2/+6
| | | | | | | |
* | | | | | | | Merge branch ↵Filipa Lacerda2017-02-072-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27774-text-color-contrast-is-barely-readable-for-pipelines-visualization-graph-page-with-roboto-fonts' into 'master' Give ci status text on pipeline graph a better font-weight Closes #27774 See merge request !9033
| * | | | | | | | Give ci status text on pipeline graph a better font-weight27774-text-color-contrast-is-barely-readable-for-pipelines-visualization-graph-page-with-roboto-fontsdimitrieh2017-02-072-1/+5
| | | | | | | | |
* | | | | | | | | Merge branch '24716-fix-ctrl-click-links' into 'master' Clement Ho2017-02-076-4/+124
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Ctrl+Click support for Todos and Merge Request page tabs Closes #24716 See merge request !8898
| * | | | | | | | | Simplify conditionsKushal Pandya2017-02-071-5/+3
| | | | | | | | | |
| * | | | | | | | | ESLint: remove `expect()` from `beforeEach()`Kushal Pandya2017-02-071-4/+18
| | | | | | | | | |
View Lorry Controller Status