summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use Enumerable#index_by where possibledm-use-index-byDouwe Maan2017-03-165-20/+5
|
* Merge branch '29142-add-prometheus-integration-documentation' into 'master' Achilleas Pipinellis2017-03-162-3/+3
|\ | | | | | | | | | | | | Fix config option to disable Prometheus Closes #29142 See merge request !10019
| * Fix config option to disable PrometheusJoshua Lambert2017-03-162-3/+3
|/
* Merge branch 'compare-remote-search' into 'master' Alfredo Sumaran2017-03-162-2/+11
|\ | | | | | | | | | | | | Enabled remote filter in compare dropdowns Closes #29545 See merge request !9997
| * Enabled remote filter in compare dropdownscompare-remote-searchPhil Hughes2017-03-162-2/+11
| | | | | | | | | | | | | | Previously if the project had more than 100 branches or tags it wouldnt display them even after searching. This now correctly sends an AJAx request to the backend to search for the branches/tags Closes #29545
* | Merge branch '29560-fix-mr-count-title-spacing' into 'master' Annabel Dunstone Gray2017-03-161-1/+4
|\ \ | | | | | | | | | | | | | | | | | | Fix spacing between MR number and title Closes #29560 See merge request !10008
| * | Fix spacing between MR number and title29560-fix-mr-count-title-spacingKushal Pandya2017-03-161-1/+4
| |/
* | Merge branch 'cycle-analytics-commit-icon' into 'master' Annabel Dunstone Gray2017-03-161-6/+4
|\ \ | | | | | | | | | | | | | | | | | | Fixed commit icon size in cycle analyitcs Closes #29536 See merge request !9994
| * | Fixed commit icon size in cycle analyitcscycle-analytics-commit-iconPhil Hughes2017-03-161-6/+4
| | | | | | | | | | | | Closes #29536
* | | Merge branch 'realtime-methods-docs' into 'master' Clement Ho2017-03-161-0/+15
|\ \ \ | | | | | | | | | | | | | | | | Add docs for realtime polling for the frontend. See merge request !9998
| * | | Fix spelling and grammatical errors.realtime-methods-docsJacob Schatz2017-03-161-1/+1
| | | |
| * | | Add Server issues 429 Too Many Requests disable polling.Jacob Schatz2017-03-161-1/+2
| | | |
| * | | Fix up suggestions on content changes.Jacob Schatz2017-03-161-2/+2
| | | |
| * | | Add docs for realtime polling for the frontend.Jacob Schatz2017-03-161-0/+14
| | |/ | |/|
* | | Merge branch '29228-update-award-emoji-native-unicode-alignment' into 'master' Annabel Dunstone Gray2017-03-161-6/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update award emoji button native emoji alignment Closes #29228 See merge request !9985
| * | | Update award emoji button native emoji alignment29228-update-award-emoji-native-unicode-alignmentEric Eastwood2017-03-161-6/+10
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29228
* | | | Merge branch 'pages-multiple-ips-doc' into 'master' Kamil Trzciński2017-03-165-20/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | The GitLab Pages external-http and external-https arguments can be specified multiple times See merge request !9812
| * | | | The GitLab Pages external-http and external-https arguments can be specified ↵Nick Thomas2017-03-085-20/+25
| | | | | | | | | | | | | | | | | | | | multiple times
* | | | | Merge branch '29142-add-prometheus-integration-documentation' into 'master' Achilleas Pipinellis2017-03-1610-19/+316
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prometheus Service Integration Documentation Closes #29142 See merge request !9954
| * | | | | Fix broken links limit lines to 80 charsAchilleas Pipinellis2017-03-163-28/+55
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Add prometheus memory requirements, include additional detail on disabling ↵Joshua Lambert2017-03-162-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | prometheus in docs.
| * | | | | Minor changes to administration docJoshua Lambert2017-03-151-16/+10
| | | | | |
| * | | | | Add Prometheus related image.Joshua Lambert2017-03-151-0/+0
| | | | | |
| * | | | | Add additional configuration information and troubleshooting information.Joshua Lambert2017-03-151-5/+16
| | | | | |
| * | | | | Refactor Prometheus integration docsAchilleas Pipinellis2017-03-1511-45/+145
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | First draft of Prometheus Service IntegrationJoshua Lambert2017-03-157-0/+164
| | | | | |
* | | | | | Merge branch '27988-fix-transient-failure-in-commits-api' into 'master' Sean McGivern2017-03-1662-91/+107
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure dots in project and group ID are allowed in the API endpoints Closes #27988 See merge request !9944
| * | | | | | Add `requirements: { id: %r{[^/]+} }` for all projects and groups namespaced ↵Rémy Coutable2017-03-1661-77/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API routes Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Ensure dots in project path is allowed in the commits APIRémy Coutable2017-03-144-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch ↵Rémy Coutable2017-03-163-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29565-name-of-the-uncompressed-folder-of-a-tag-archive-changed' into 'master' Fix archive prefix bug for refs containing dots Closes #29565 See merge request !10007
| * | | | | | | Fix archive prefix bug for refs containing dotsMark Fletcher2017-03-163-1/+11
| | | | | | | |
* | | | | | | | Merge branch 'stale-merge-requests' into 'master' Rémy Coutable2017-03-161-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add policy for closing stale merge requests See merge request !10013
| * | | | | | | | Add policy for closing stale merge requestsstale-merge-requestsAdam Niedzielski2017-03-161-0/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'patch-1' into 'master' Rémy Coutable2017-03-161-0/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggest a more secure way of handling SSH host keys in docker builds [ci skip] See merge request !2797
| * | | | | | | | | Suggest a more secure way of handling SSH host keys in docker buildsMaxime Besson2017-02-241-0/+14
| | | | | | | | | |
* | | | | | | | | | Merge branch 'feature/gb/speed-up-gitlab-qa-docker-image-builds' into 'master' Rémy Coutable2017-03-163-1/+66
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up GitLab QA docker image builds Closes gitlab-qa#33 See merge request !10000
| * | | | | | | | | | Speed up GitLab QA docker image buildsfeature/gb/speed-up-gitlab-qa-docker-image-buildsGrzegorz Bizon2017-03-163-1/+66
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'rs-expand-changelog-examples' into 'master' Rémy Coutable2017-03-161-0/+20
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand on the good changelog/bad changelog documentation examples See merge request !10016
| * | | | | | | | | | | Expand on the good changelog/bad changelog documentation examplesRobert Speicher2017-03-161-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge branch 'fixed-issue-boards-modal-not-searching' into 'master' Filipa Lacerda2017-03-162-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed search not working in issue boards modal See merge request !10010
| * | | | | | | | | | | Fixed search not working in issue boards modalfixed-issue-boards-modal-not-searchingPhil Hughes2017-03-162-1/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tc-clean-up-no-label-doc' into 'master' Sean McGivern2017-03-162-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put the use of "No Label" in the labels description See merge request !9993
| * | | | | | | | | | | | Put the use of "No Label" in the descriptiontc-clean-up-no-label-docToon Claes2017-03-162-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To get the issues that have no label, the special keyword `No Label` can be used. This `No Label` label can be used like any other label.
* | | | | | | | | | | | | Merge branch 'doc_about_branch_creation_in_empty_repo' into 'master' Sean McGivern2017-03-161-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document a New Branch feature for Bare Projects See merge request !9996
| * | | | | | | | | | | | | Document a New Branch feature for Bare ProjectsValery Sizov2017-03-161-0/+7
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '29534-todos-performance' into 'master' Sean McGivern2017-03-162-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve TODOs performance See merge request !10004
| * | | | | | | | | | | | Include routes when loading user projectsJarka Kadlecova2017-03-162-2/+24
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '29529-quick-fix' into 'master' Sean McGivern2017-03-162-15/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure not valid anymore labels don't break issue pages Closes #29529 See merge request !9995
| * | | | | | | | | | | This quick-fixes an issue with existing award emoji not being valid anymoreRémy Coutable2017-03-162-15/+18
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Emoji#gl_emoji_tag now returns early instead of raising a 500 error. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch '28991-viewing-old-wiki-page-version-edit-button-exists' into ↵29565-name-of-the-uncompressed-folder-of-a-tag-archive-changedRémy Coutable2017-03-164-1/+55
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [#28991] Resolve "Viewing old wiki page version, "Edit" button exists, brings up latest markup" Closes #28991 See merge request !9966