summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make diff wrap.diff-linesJacob Schatz2016-04-201-1/+1
|
* Merge branch 'feature/incremental-build-trace-update' into 'master' Rémy Coutable2016-04-206-22/+191
|\ | | | | | | | | | | | | | | | | Add incremental build trace update API Closes #14537 Must be merged if we want changes from gitlab-org/gitlab-ci-multi-runner!124 to work. See merge request !3447
| * Fix Build#append_trace method usage when trace file doesn't exists yetTomasz Maczukin2016-04-202-3/+4
| |
| * Fix some typos in documentationTomasz Maczukin2016-04-202-5/+5
| | | | | | | | [ci skip]
| * Add documentation of incremental trace update APITomasz Maczukin2016-04-202-22/+89
| | | | | | | | [ci skip]
| * Update CHANGELOGTomasz Maczukin2016-04-201-0/+1
| | | | | | | | [ci skip]
| * Make sure that appending is done on a valid lengthTomasz Maczukin2016-04-203-6/+17
| |
| * Add range checkingTomasz Maczukin2016-04-204-11/+57
| |
| * Add incremental build trace update APITomasz Maczukin2016-04-203-1/+44
|/
* Merge branch 'slack_wiki_notifications' into 'master' Rémy Coutable2016-04-2021-17/+263
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add slack notifications for wiki pages ## What does this MR do? Lets the Slack service be configured to send notifications when wiki pages are created or edited. ## Are there points in the code the reviewer needs to double check? I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :) ## Why was this MR needed? Related to #563 and fixes #4233. See merge request !2998
| * Fix wiki testsSebastian Klier2016-04-204-1/+26
| |
| * Update changelogSebastian Klier2016-04-201-1/+1
| |
| * Fix test to conform to conventionsSebastian Klier2016-04-201-7/+8
| |
| * Fix testSebastian Klier2016-04-201-4/+4
| |
| * update changelogSebastian Klier2016-04-201-1/+1
| |
| * formatting and test structureSebastian Klier2016-04-203-28/+45
| |
| * add wiki_page helper to url_builderSebastian Klier2016-04-202-1/+8
| |
| * improve check if wiki page is persistedSebastian Klier2016-04-201-1/+1
| |
| * remove unnecessary methodsSebastian Klier2016-04-201-11/+0
| |
| * add slack notifications for wiki pagesSebastian Klier2016-04-2017-6/+213
| | | | | | | | update changelog
* | Merge branch 'feature/raw-trace-output' into 'master' Rémy Coutable2016-04-205-2/+45
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add raw build trace output Closes #15308, #15147 Changes in the UI: - on finished build: ![raw-on-finished-build](/uploads/0e0904940db5b381ae064d49343c6508/raw-on-finished-build.png) - on running build: ![raw-on-running-build](/uploads/0e4c800b68c12bdd0cbd2eea732b22ff/raw-on-running-build.png) See merge request !3767
| * | Improve and fix specs for raw tracefeature/raw-trace-outputTomasz Maczukin2016-04-191-4/+8
| | |
| * | Use Rails-way to send file by X-SendfileTomasz Maczukin2016-04-191-5/+2
| | |
| * | Update CHANGELOGTomasz Maczukin2016-04-191-0/+1
| | |
| * | Add feature specs for raw traceTomasz Maczukin2016-04-193-2/+28
| | |
| * | Switch raw trace to use X-Sendfile headerTomasz Maczukin2016-04-192-4/+7
| | |
| * | Add raw trace output for GitLab WorkhorseTomasz Maczukin2016-04-193-1/+13
| | |
* | | Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher2016-04-2027-146/+671
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
| * | Rename License entity to RepoLicense to avoid conflict with EElicense-templates-and-api-12804Rémy Coutable2016-04-192-3/+3
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Fix specsRémy Coutable2016-04-184-19/+9
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Update to licensee 8.0.0 and fix API specsRémy Coutable2016-04-184-12/+13
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Fix features specs (hopefully)Rémy Coutable2016-04-182-4/+4
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Continue implementation of the license template selector and /licenses API ↵Rémy Coutable2016-04-1822-207/+588
| | | | | | | | | | | | | | | | | | endpoint Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Initial implementation if license template selector and /licenses/:key API ↵Anton Davydov2016-04-1812-3/+156
| | | | | | | | | | | | endpoint
* | | Merge branch 'issue_15390' into 'master' Robert Speicher2016-04-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix javascript errors with invalid json because of commas fixes #15390 See merge request !3827
| * | | Fix javascript errors with invalid json because of commasFelipe Artur2016-04-191-1/+1
| | | |
* | | | Update CHANGELOGRobert Speicher2016-04-191-1/+3
| |_|/ |/| | | | | | | | [ci skip]
* | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-04-192-7/+7
|\ \ \
| * \ \ Merge branch 'rs-label-xss' into 'master' Jacob Schatz2016-04-192-7/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove XSS vulnerability in Label and Milestone dropdowns Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15389 See merge request !1951
| | * | | Remove XSS vulnerability in Label and Milestone dropdownsRobert Speicher2016-04-192-7/+7
| |/ / /
* | | | CLearify shared runner warning.Sytse Sijbrandij2016-04-191-1/+1
| |/ / |/| |
* | | Merge branch '15139-fix-constants-redefinition-warnings' into 'master' Robert Speicher2016-04-1910-17/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Define constants only if not defined yet and freeze them Fixes #15139. See merge request !3810
| * | | Get rid of more requires, which causes warnings when code is reloaded15139-fix-constants-redefinition-warningsRémy Coutable2016-04-194-12/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Remove useless require 'file_size_validator' causing warningsRémy Coutable2016-04-196-6/+0
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Define constants only if not defined yet and freeze themRémy Coutable2016-04-192-7/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'imported-ghe-project-names-links-to-github' into 'master' Robert Speicher2016-04-194-2/+46
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix GitHub project's link in the import page when provider has a custom URL Closes gitlab-org/gitlab-ee#478 See merge request !3803
| * | | Fix GitHub project's link on import page when provider has a custom URLDouglas Barbosa Alexandre2016-04-194-2/+46
| | | |
* | | | Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan2016-04-1926-80/+390
|\ \ \ \
| * | | | Add support to cherry-pick any commitP.S.V.R2016-04-1826-80/+390
| | | | | | | | | | | | | | | | | | | | | | | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
* | | | | Merge branch 'mr-formatting' into 'master' Robert Speicher2016-04-1924-36/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use ! rather than # for merge request references Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278 See merge request !3740
View Lorry Controller Status