summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition errorrs-fix-already-defined-constantRobert Speicher2017-04-121-2/+2
* Merge branch 'fix-missing-capitalisation-buttons' into 'master' Clement Ho2017-04-122-4/+8
|\
| * Fixed missing help ui view capitalisation buttonsfix-missing-capitalisation-buttonsJose Ivan Vargas2017-04-112-4/+8
* | Merge branch 'poll-test-fix' into 'master' Filipa Lacerda2017-04-121-36/+57
|\ \
| * | Fixed random failures with Poll specpoll-test-fixPhil Hughes2017-04-121-36/+57
* | | Merge branch 'fix_spaces_in_label_title' into 'master' Sean McGivern2017-04-123-0/+26
|\ \ \
| * | | Remove heading and trailing spaces from label's color and titleblackst0ne2017-04-123-0/+26
* | | | Merge branch 'contributing-ci-templates' into 'master' Rémy Coutable2017-04-122-1/+6
|\ \ \ \
| * | | | Include CONTRIBUTING.md file when importing .gitlab-ci.yml templatescontributing-ci-templatesAdam Niedzielski2017-04-122-1/+6
* | | | | Merge branch 'improve-testing-documentation' into 'master' Robert Speicher2017-04-122-99/+375
|\ \ \ \ \
| * | | | | Improve the testing documentationimprove-testing-documentationRémy Coutable2017-04-121-23/+23
| * | | | | Fix link againRémy Coutable2017-04-111-1/+1
| * | | | | Fix path to migrationsRémy Coutable2017-04-111-1/+1
| * | | | | Fix wrong linkRémy Coutable2017-04-111-1/+1
| * | | | | Re-organize testing doc, and add RSpec structure docRémy Coutable2017-04-102-89/+165
| * | | | | Document GitLab QARémy Coutable2017-04-101-3/+28
| * | | | | Improve testing documentation with Robert's feedbackRémy Coutable2017-04-102-37/+49
| * | | | | Firs pass at improving the testing documentationRémy Coutable2017-04-102-31/+194
* | | | | | Merge branch 'user-activity-scroll-bar' into 'master' Annabel Dunstone Gray2017-04-122-1/+5
|\ \ \ \ \ \
| * | | | | | Let browser set overflow-x scroll on user activity calendar.user-activity-scroll-barBryce Johnson2017-04-112-1/+5
* | | | | | | Merge branch '29056-backport-ee-cleanup-database-file' into 'master' Douwe Maan2017-04-1217-20/+75
|\ \ \ \ \ \ \
| * | | | | | | removes redundant code from database.rb29056-backport-ee-cleanup-database-fileTiago Botelho2017-04-1117-20/+75
* | | | | | | | Merge branch 'improve-discussions-feature-attempt-1' into 'master'Douwe Maan2017-04-125-94/+78
|\ \ \ \ \ \ \ \
| * | | | | | | | Separate examples for each otherimprove-discussions-feature-attempt-1Luke "Jared" Bennett2017-04-125-64/+66
| * | | | | | | | Collapse similar sibling scenariosLuke "Jared" Bennett2017-04-121-41/+12
| * | | | | | | | Use empty_project for resources that are independent of the repoLuke "Jared" Bennett2017-04-121-7/+18
* | | | | | | | | Merge branch 'patch-8' into 'master' Rémy Coutable2017-04-121-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix grammarIsmail S2017-04-111-2/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '27755-update-pipelines-documentation' into 'master' 30843-move-about-gitlab-com-installation-instructions-to-documentationSean Packham (GitLab)2017-04-121-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace pipelines image in docs27755-update-pipelines-documentationAchilleas Pipinellis2017-04-101-0/+0
* | | | | | | | | | Merge branch 'zj-fix-coverage-bug' into 'master' Kamil Trzciński2017-04-124-10/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Return nil as coverage instead of a File objectzj-fix-coverage-bugZ.J. van de Weg2017-04-124-10/+24
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'zj-improve-template' into 'master' Sean McGivern2017-04-121-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Let uses hide verbose output by defaultZ.J. van de Weg2017-04-121-0/+8
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/gb/qa/fix-outdated-admin-area-link-title' into 'master' Rémy Coutable2017-04-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fix outdated 'Admin area' link label in GitLab QAGrzegorz Bizon2017-04-121-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'zj-api-fix-build-events' into 'master' Rémy Coutable2017-04-124-9/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix API not accepting job_events for webhookszj-api-fix-build-eventsZ.J. van de Weg2017-04-124-9/+24
| |/ / / / / / / /
* | | | | | | | | Merge branch 'grpc-1.2.2' into 'master' Sean McGivern2017-04-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use gRPC 1.2.2Jacob Vosmaer2017-04-101-1/+1
* | | | | | | | | | Merge branch 'siemens/gitlab-ce-fix/subgroup-hide-button' into 'master' Rémy Coutable2017-04-124-2/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update changelog with MR idsiemens/gitlab-ce-fix/subgroup-hide-buttonDmitriy Zaporozhets2017-04-111-1/+1
| * | | | | | | | | | Move permission to create subgroup into GroupPolicyDmitriy Zaporozhets2017-04-116-28/+8
| * | | | | | | | | | fix(subgroups): add verification of group creation capability to subgroup UIFabio Huser2017-03-303-1/+27
* | | | | | | | | | | Merge branch 'gitaly-testing' into 'master' Rémy Coutable2017-04-1212-143/+197
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-1112-143/+197
* | | | | | | | | | | | Merge branch '30457-expire-note-destroy' into 'master'Sean McGivern2017-04-123-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix issue's note cache expiration after deletemhasbini2017-04-113-1/+16
* | | | | | | | | | | | Merge branch 'bb_save_trace' into 'master' Sean McGivern2017-04-123-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | [BB Importer] Save the error trace and the whole raw documentbb_save_traceValery Sizov2017-04-113-6/+9
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |