summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove CI/CD models directory from `eager_load_paths`fix/gb/remove-ci-models-from-eager-load-pathsGrzegorz Bizon2017-05-051-1/+0
* Merge branch 'cycle-anyltics-landing-box-fix' into 'master' Annabel Dunstone Gray2017-05-052-11/+30
|\
| * Fixed cycle analytics intro box styling regressioncycle-anyltics-landing-box-fixPhil Hughes2017-05-052-11/+30
* | Merge branch '31689-request-access-spacing' into 'master' Annabel Dunstone Gray2017-05-054-5/+7
|\ \
| * | 31689 Add default margin-top to user request table on project members page31689-request-access-spacingtauriedavis2017-05-044-5/+7
* | | Merge 'dev/master' into masterRuben Davila2017-05-057-12/+56
|\ \ \
| * | | Update CHANGELOG.md for 9.1.3Lin Jen-Shin2017-05-051-0/+1
| * | | Update CHANGELOG.md for 8.17.6Lin Jen-Shin2017-05-051-0/+11
| * | | Update CHANGELOG.md for 9.0.7Lin Jen-Shin2017-05-051-0/+12
| * | | Update CHANGELOG.md for 9.1.3Lin Jen-Shin2017-05-051-0/+11
| * | | Merge branch 'droplab-templating-xss-fix' into 'master' Jacob Schatz2017-05-036-12/+21
| |\ \ \
| | * | | [ci skip] Add comment to regexLuke "Jared" Bennett2017-04-271-1/+2
| | * | | Merge remote-tracking branch 'origin/master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-2665-202/+336
| | |\ \ \
| | * | | | Fixed being behindLuke "Jared" Bennett2017-04-2612-28/+181
| | * | | | Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-25285-6534/+2140
| | |\ \ \ \
| | * | | | | Fixed dodgy mergeLuke "Jared" Bennett2017-04-2412-181/+28
| | * | | | | Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-24745-6430/+9980
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-1715-60/+149
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-1519-39/+169
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into droplab-templating-xss-fixLuke "Jared" Bennett2017-04-14193-3172/+4966
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Update specsLuke "Jared" Bennett2017-04-122-2/+8
| | * | | | | | | | | Used underscore to template list children to utilize their simple escaped int...Luke "Jared" Bennett2017-04-124-10/+12
* | | | | | | | | | | Merge branch '12910-personal-snippets-notes' into 'master' Sean McGivern2017-05-0534-92/+359
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Support comments for personal snippetsJarka Kadlecova2017-05-0534-92/+359
* | | | | | | | | | | | Merge branch 'remove-frontend-team-label' into 'master' Rémy Coutable2017-05-051-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove FE team labelSean McGivern2017-05-051-3/+6
* | | | | | | | | | | | | Merge branch '31727-timestamps-in-merge-request-discussion-overflow-role-badg...Annabel Dunstone Gray2017-05-051-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Wrap note actions below timestamp on discussionsSam Rose2017-05-051-6/+10
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'backport-ee-4b464eaaee' into 'master' Robert Speicher2017-05-055-8/+38
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Backport avatar-related spec changes from gitlab-org/gitlab-ee@4b464eaaeebackport-ee-4b464eaaeeRémy Coutable2017-05-045-8/+38
* | | | | | | | | | | | | Merge branch 'prometheus-integration-test-setting-fix' into 'master' Robert Speicher2017-05-055-1/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Improved changelog entry, also changed error message for HTTParty errorprometheus-integration-test-setting-fixJose Ivan Vargas2017-05-043-3/+3
| * | | | | | | | | | | | | Improved code styling and added a HTTParty rescue blockJose Ivan Vargas2017-05-044-22/+29
| * | | | | | | | | | | | | Added specsJose Ivan Vargas2017-05-043-5/+33
| * | | | | | | | | | | | | Added rescue block for the test method for the prometheus serviceJose Ivan Vargas2017-05-043-3/+12
* | | | | | | | | | | | | | Merge branch 'mrchrisw-import-shell-timeout'Sean McGivern2017-05-055-2/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeoutChris Wilson2017-04-275-2/+51
* | | | | | | | | | | | | | | Merge branch '31747-fix-transient-failures-when-tests-run-too-fast' into 'mas...Sean McGivern2017-05-052-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Set minimum latency to be non-negative number.Pawel Chojnacki2017-05-052-9/+9
* | | | | | | | | | | | | | | Merge branch 'fix-email-receiver-metrics' into 'master' Rémy Coutable2017-05-053-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix email receiver metrics eventsfix-email-receiver-metricsSean McGivern2017-05-053-3/+3
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'issue-boards-no-avatar' into 'master' Filipa Lacerda2017-05-058-12/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Changed how the default avatar is setissue-boards-no-avatarPhil Hughes2017-05-047-14/+33
| * | | | | | | | | | | | | | | Merge branch 'master' into issue-boards-no-avatarPhil Hughes2017-05-04667-3440/+13617
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fixed avatar not displaying in issue boardsPhil Hughes2017-04-284-1/+8
* | | | | | | | | | | | | | | | | Merge branch '27614-instant-comments' into 'master' Filipa Lacerda2017-05-0516-65/+607
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Add instant comments supportKushal Pandya2017-05-0516-65/+607
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '30237-pipelines-actions-make-2-requests' into 'master' Kamil Trzciński2017-05-053-3/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add specs for new pipeline action for JSON format30237-pipelines-actions-make-2-requestsGrzegorz Bizon2017-05-051-0/+36
| * | | | | | | | | | | | | | | | Use wrap_parameters in pipelines controllerGrzegorz Bizon2017-05-051-0/+2