summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* NIGNX -> Nginxfix-nignx-typoSean McGivern2016-12-051-1/+1
* Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' Kamil Trzciński2016-12-0524-104/+132
|\
| * Fix Rubocop offense in merge request specsfix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-301-1/+0
| * Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-30311-2250/+3323
| |\
| * | Move MWPS document to new locationAchilleas Pipinellis2016-11-296-49/+54
| * | Fix tests for allowing merged if pipeline succeededGrzegorz Bizon2016-11-251-2/+2
| * | Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-25963-4137/+8668
| |\ \
| * | | Add Changelog entry for Merge When Pipeline SucceedsGrzegorz Bizon2016-11-211-0/+4
| * | | Update some docs to reflect MWPS name changeGrzegorz Bizon2016-11-2110-24/+24
| * | | Rename MWPS in user interface and feature testsGrzegorz Bizon2016-11-212-15/+16
| * | | Rename MWPS in system notes and related testsGrzegorz Bizon2016-11-215-8/+8
| * | | Rename MWBS service to Merge When Pipeline SucceedsGrzegorz Bizon2016-11-217-17/+34
* | | | Merge branch 'zj-issue-new-over-issue-create' into 'master' Kamil Trzciński2016-12-053-2/+13
|\ \ \ \
| * | | | Accept `issue new` as command to create an issueZ.J. van de Weg2016-12-053-2/+13
|/ / / /
* | | | Merge branch '25148_fix_gfm_typo' into 'master' Achilleas Pipinellis2016-12-041-2/+2
|\ \ \ \
| * | | | fix gfm doc typo about two spaces for next line transferRydkin Maxim2016-12-031-2/+2
* | | | | Merge branch 'api-expose-commiter-details' into 'master' Rémy Coutable2016-12-044-2/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | API: Expose committer details for a commitapi-expose-commiter-detailsRobert Schilling2016-12-014-2/+20
* | | | | Merge branch 'improve-patch-update-guide' into 'master' Achilleas Pipinellis2016-12-031-2/+5
|\ \ \ \ \
| * | | | | Patch upgrade documentation should be consulted on stable branchimprove-patch-update-guideRémy Coutable2016-12-021-2/+5
* | | | | | Merge branch 'revert-918d30bf' into 'master' Achilleas Pipinellis2016-12-031-6/+0
|\ \ \ \ \ \
| * | | | | | Revert "Merge branch 'docs/patch-guide-link-to-old-guide' into 'master'"Achilleas Pipinellis2016-12-031-6/+0
|/ / / / / /
* | | | | | Merge branch 'docs/patch-guide-link-to-old-guide' into 'master' Achilleas Pipinellis2016-12-031-0/+6
|\ \ \ \ \ \
| * | | | | | Link to old patch update guide now that we install workhorse with a raketaskAchilleas Pipinellis2016-12-031-0/+6
|/ / / / / /
* | | | | | Merge branch '23696-fix-diff-view-highlighting' into 'master' Fatih Acet2016-12-039-577/+568
|\ \ \ \ \ \
| * | | | | | satisfy eslint no-param-reassign rule23696-fix-diff-view-highlightingMike Greiling2016-12-022-8/+10
| * | | | | | display error when a tab cannot be loadedMike Greiling2016-12-021-1/+5
| * | | | | | use shorthand instead of length > 0 (http://airbnb.io/javascript/#comparison-...Mike Greiling2016-12-021-1/+1
| * | | | | | use e instead of event variable nameMike Greiling2016-12-022-10/+10
| * | | | | | adjust scrollToElement to account for fixed merge request tabsMike Greiling2016-12-021-5/+7
| * | | | | | re-apply MR !6285 "Added forceLoad ability to singleFileDiffs, added callback...Luke Bennett2016-12-023-10/+32
| * | | | | | fix eslint failures on Diff and MergeRequestTabsMike Greiling2016-12-023-117/+119
| * | | | | | remove array destructuring until we can fix babel configMike Greiling2016-12-021-2/+6
| * | | | | | refactor Diff class event bindingsMike Greiling2016-12-021-48/+48
| * | | | | | refactor Diff to es6 class syntaxMike Greiling2016-12-023-42/+35
| * | | | | | prefer es6 string interpolation over concatinationMike Greiling2016-12-021-27/+26
| * | | | | | refactor awkward bind workarounds into arrow functionsMike Greiling2016-12-021-69/+44
| * | | | | | refactor MergeRequestTabs to es6 class syntaxMike Greiling2016-12-023-91/+88
| * | | | | | update CHANGELOG.md to reflect changes in !7090Mike Greiling2016-12-021-0/+4
| * | | | | | fix diff line highlighting by moving method from the MergeRequestTabs class t...Mike Greiling2016-12-022-42/+48
| * | | | | | temporarily revert "Added forceLoad ability to singleFileDiffs, added callbac...Mike Greiling2016-12-022-28/+9
* | | | | | | Merge branch '24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled' i...Sean McGivern2016-12-033-1/+22
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Test all values for `enabled_git_access_protocol`Andrew Smith2016-12-021-9/+14
| * | | | | | If SSH prototol is disabled don't say the user requires SSH keysAndrew Smith2016-12-013-1/+17
* | | | | | | Merge branch 'system-font-test' into 'master' Jacob Schatz2016-12-0228-140/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove source sans prosystem-font-testAnnabel Dunstone Gray2016-12-0128-143/+1
| * | | | | | | Use system fontAnnabel Dunstone Gray2016-12-011-1/+4
* | | | | | | | Merge branch 'mr-origin-7855' into 'master' Rémy Coutable2016-12-024-17/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Added a changelog entrymattl2016-12-021-0/+4
| * | | | | | | | WIP: Adds a default commit message when adding a README (#25167)mattl2016-12-022-16/+2