summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Instantiate ImageFile for diff-files in Diff24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-imageLuke "Jared" Bennett2016-12-044-4/+11
* 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
| * | | | WIP: Adds a default commit message when adding a README (#25167)25167-default-readme-commit-messageMatt Lee2016-11-301-1/+1
* | | | | Merge branch '25264-ref-commit' into 'master' Jacob Schatz2016-12-024-13/+17
|\ \ \ \ \
| * | | | | Change prop name to keep consistency with other props.25264-ref-commitFilipa Lacerda2016-12-022-9/+9
| * | | | | Adds changelog entryFilipa Lacerda2016-12-022-1/+5
| * | | | | Change ref property to commitRefFilipa Lacerda2016-12-023-13/+13
* | | | | | Merge branch 'cleanup-common_utils.js' into 'master' Alfredo Sumaran2016-12-027-103/+33
|\ \ \ \ \ \
| * | | | | | Clean up common_utils.js (!7318)winniehell2016-12-017-103/+33
* | | | | | | Merge branch '25251-actionview-template-error-undefined-method-text-for-nil-n...Rémy Coutable2016-12-023-1/+14
|\ \ \ \ \ \ \
| * | | | | | | Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass25251-actionview-template-error-undefined-method-text-for-nil-nilclassValery Sizov2016-12-023-1/+14
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '23500-enable-colorvariable' into 'master' Annabel Dunstone Gray2016-12-0269-955/+1982
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Enable ColorVariable in scss-lintSam Rose2016-12-0169-955/+1982
* | | | | | | Merge branch '25098-header-margins-on-pipeline-settings' into 'master' Annabel Dunstone Gray2016-12-022-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Fixed row margins on Pipeline Settings page in order to unify stylesRyan Harris2016-12-012-1/+6
* | | | | | | | Merge branch 'rs-simplify-changelog-branch_name' into 'master' Rémy Coutable2016-12-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Simplify `branch_name` in bin/changelogrs-simplify-changelog-branch_nameRobert Speicher2016-12-021-1/+1
* | | | | | | | | Merge branch 'rs-project-snippet-security-specs' into 'master' Rémy Coutable2016-12-023-204/+168
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Speed up project snippet security request specsrs-project-snippet-security-specsRobert Speicher2016-12-023-204/+168
| |/ / / / / / /
View Lorry Controller Status