Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add a new have_html_escaped_body_text that match an HTML-escaped text20121-add-a-new-have_html_escaped_body_text-matcher | Rémy Coutable | 2017-03-17 | 2 | -31/+37 |
| | | | | | | | This solves transient failures when a text contains HTML-escapable characters such as `'`. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch 'fix-make-time-test-more-reliable' into 'master' | Rémy Coutable | 2017-03-17 | 1 | -2/+2 |
|\ | | | | | | | | | Make the test less time sensitive by extending 0.2 days See merge request !10035 | ||||
| * | Make the test less time sensitive by extending 0.2fix-make-time-test-more-reliable | Lin Jen-Shin | 2017-03-17 | 1 | -2/+2 |
|/ | | | | | | | days. This shall fix: https://gitlab.com/gitlab-org/gitlab-ce/builds/12411626 and other test failures for the same thing. | ||||
* | Merge branch 'fix-unknown-emojis-in-frequently-used-awards' into 'master' | Alfredo Sumaran | 2017-03-17 | 5 | -9/+89 |
|\ | | | | | | | | | Protect against unknown emojis in frequently used list See merge request !10020 | ||||
| * | Protect against unknown emojis in frequently used listfix-unknown-emojis-in-frequently-used-awards | Eric Eastwood | 2017-03-16 | 5 | -9/+89 |
| | | | | | | | | See https://gitlab.slack.com/archives/frontend/p1489690607738864 | ||||
* | | Merge branch 'dm-use-index-by' into 'master' | Robert Speicher | 2017-03-17 | 5 | -20/+5 |
|\ \ | | | | | | | | | | | | | Use Enumerable#index_by where possible See merge request !10011 | ||||
| * | | Use Enumerable#index_by where possibledm-use-index-by | Douwe Maan | 2017-03-16 | 5 | -20/+5 |
| | | | |||||
* | | | Merge branch 'fix-double-click-token-name' into 'master' | Alfredo Sumaran | 2017-03-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix double click token name Closes #29599 See merge request !10023 | ||||
| * | | | Fix double click token namefix-double-click-token-name | Clement Ho | 2017-03-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'fix-slow-queries-for-branches-index' into 'master' | Douwe Maan | 2017-03-16 | 10 | -6/+56 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | removes n+1 query from tags and branches indexes See merge request !9905 | ||||
| * | | | | removes n+1 query from tags and branches indexesfix-slow-queries-for-branches-index | Tiago Botelho | 2017-03-16 | 10 | -6/+56 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'zj-fix-slack-link' into 'master' | Rémy Coutable | 2017-03-16 | 2 | -6/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix Slack link when on notify See merge request !9999 | ||||
| * | | | | Fix Slack link when on notify | Zeger-Jan van de Weg | 2017-03-16 | 2 | -6/+5 |
|/ / / / | |||||
* | | | | Merge branch 'add-blob-copy-button' into 'master' | Robert Speicher | 2017-03-16 | 13 | -75/+102 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add copy button to blob header and use icon for Raw button See merge request !9878 | ||||
| * | | | | Fix specadd-blob-copy-button | Douwe Maan | 2017-03-16 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Use code icon for Raw | Douwe Maan | 2017-03-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix spec | Douwe Maan | 2017-03-16 | 12 | -76/+97 |
| | | | | | |||||
| * | | | | Add copy button to blob header and use icon for Raw button | Douwe Maan | 2017-03-16 | 2 | -4/+10 |
| | | | | | |||||
* | | | | | Merge branch 'fix-jasmine-describe' into 'master' | Alfredo Sumaran | 2017-03-16 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Don't use reserved name in jasmine tests See merge request !10022 | ||||
| * | | | | fix describe block to make the karma reporter happy | Mike Greiling | 2017-03-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch '29142-add-prometheus-integration-documentation' into 'master' | Achilleas Pipinellis | 2017-03-16 | 2 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix config option to disable Prometheus Closes #29142 See merge request !10019 | ||||
| * | | | | Fix config option to disable Prometheus | Joshua Lambert | 2017-03-16 | 2 | -3/+3 |
|/ / / / | |||||
* | | | | Merge branch 'compare-remote-search' into 'master' | Alfredo Sumaran | 2017-03-16 | 2 | -2/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled remote filter in compare dropdowns Closes #29545 See merge request !9997 | ||||
| * | | | | Enabled remote filter in compare dropdownscompare-remote-search | Phil Hughes | 2017-03-16 | 2 | -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 Gray | 2017-03-16 | 1 | -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-spacing | Kushal Pandya | 2017-03-16 | 1 | -1/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'cycle-analytics-commit-icon' into 'master' | Annabel Dunstone Gray | 2017-03-16 | 1 | -6/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed commit icon size in cycle analyitcs Closes #29536 See merge request !9994 | ||||
| * | | | | | Fixed commit icon size in cycle analyitcscycle-analytics-commit-icon | Phil Hughes | 2017-03-16 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #29536 | ||||
* | | | | | | Merge branch 'realtime-methods-docs' into 'master' | Clement Ho | 2017-03-16 | 1 | -0/+15 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Add docs for realtime polling for the frontend. See merge request !9998 | ||||
| * | | | | | Fix spelling and grammatical errors.realtime-methods-docs | Jacob Schatz | 2017-03-16 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add Server issues 429 Too Many Requests disable polling. | Jacob Schatz | 2017-03-16 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Fix up suggestions on content changes. | Jacob Schatz | 2017-03-16 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add docs for realtime polling for the frontend. | Jacob Schatz | 2017-03-16 | 1 | -0/+14 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch '29228-update-award-emoji-native-unicode-alignment' into 'master' | Annabel Dunstone Gray | 2017-03-16 | 1 | -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-alignment | Eric Eastwood | 2017-03-16 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29228 | ||||
* | | | | | | Merge branch 'pages-multiple-ips-doc' into 'master' | Kamil Trzciński | 2017-03-16 | 5 | -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 Thomas | 2017-03-08 | 5 | -20/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiple times | ||||
* | | | | | | | Merge branch '29142-add-prometheus-integration-documentation' into 'master' | Achilleas Pipinellis | 2017-03-16 | 10 | -19/+316 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prometheus Service Integration Documentation Closes #29142 See merge request !9954 | ||||
| * | | | | | | | Fix broken links limit lines to 80 chars | Achilleas Pipinellis | 2017-03-16 | 3 | -28/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | Add prometheus memory requirements, include additional detail on disabling ↵ | Joshua Lambert | 2017-03-16 | 2 | -13/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prometheus in docs. | ||||
| * | | | | | | | Minor changes to administration doc | Joshua Lambert | 2017-03-15 | 1 | -16/+10 |
| | | | | | | | | |||||
| * | | | | | | | Add Prometheus related image. | Joshua Lambert | 2017-03-15 | 1 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | Add additional configuration information and troubleshooting information. | Joshua Lambert | 2017-03-15 | 1 | -5/+16 |
| | | | | | | | | |||||
| * | | | | | | | Refactor Prometheus integration docs | Achilleas Pipinellis | 2017-03-15 | 11 | -45/+145 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | First draft of Prometheus Service Integration | Joshua Lambert | 2017-03-15 | 7 | -0/+164 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '27988-fix-transient-failure-in-commits-api' into 'master' | Sean McGivern | 2017-03-16 | 62 | -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 Coutable | 2017-03-16 | 61 | -77/+91 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API routes Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Ensure dots in project path is allowed in the commits API | Rémy Coutable | 2017-03-14 | 4 | -17/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | | Merge branch ↵ | Rémy Coutable | 2017-03-16 | 3 | -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 dots | Mark Fletcher | 2017-03-16 | 3 | -1/+11 |
| | | | | | | | | | |