summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '23696-fix-diff-view-highlighting' into 'master' Fatih Acet2016-12-037-524/+508
|\
| * 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-022-64/+63
| * 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-022-90/+87
| * 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-031-1/+1
|\ \ | |/ |/|
| * If SSH prototol is disabled don't say the user requires SSH keysAndrew Smith2016-12-011-1/+1
* | 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-023-17/+3
|\ \ \
| * | | 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-022-8/+8
|\ \ \ \
| * | | | Change prop name to keep consistency with other props.25264-ref-commitFilipa Lacerda2016-12-021-4/+4
| * | | | Adds changelog entryFilipa Lacerda2016-12-021-1/+1
| * | | | Change ref property to commitRefFilipa Lacerda2016-12-022-8/+8
* | | | | Merge branch 'cleanup-common_utils.js' into 'master' Alfredo Sumaran2016-12-024-64/+29
|\ \ \ \ \
| * | | | | Clean up common_utils.js (!7318)winniehell2016-12-014-64/+29
* | | | | | Merge branch '23500-enable-colorvariable' into 'master' Annabel Dunstone Gray2016-12-0267-954/+1977
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Enable ColorVariable in scss-lintSam Rose2016-12-0167-954/+1977
* | | | | | Merge branch '25098-header-margins-on-pipeline-settings' into 'master' Annabel Dunstone Gray2016-12-021-1/+1
|\ \ \ \ \ \
| * | | | | | Fixed row margins on Pipeline Settings page in order to unify stylesRyan Harris2016-12-011-1/+1
* | | | | | | Merge branch 'process-commit-worker-improvements' into 'master' Douwe Maan2016-12-023-10/+21
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Pass commit data to ProcessCommitWorkerprocess-commit-worker-improvementsYorick Peterse2016-12-013-10/+21
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '24726-remove-across-gitlab' into 'master' Annabel Dunstone Gray2016-12-013-7/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | 24726 Remove Across GitLab from side navigation24726-remove-across-gitlabtauriedavis2016-12-013-7/+0
| | |/ / / | |/| | |
* | | | | Merge branch '24814-pipeline-tabs' into 'master' Fatih Acet2016-12-017-14/+166
|\ \ \ \ \
| * | | | | Improvements after review24814-pipeline-tabsFilipa Lacerda2016-11-304-21/+21
| * | | | | Fixes after reviewFilipa Lacerda2016-11-301-11/+3
| * | | | | Adds .matches polyfillFilipa Lacerda2016-11-301-2/+23
| * | | | | Adds tests for builds url and tabs behaviourFilipa Lacerda2016-11-302-3/+3
| * | | | | Fix after reviewFilipa Lacerda2016-11-304-13/+20
| * | | | | Adds tests for tabs in the rspec for pipelinesFilipa Lacerda2016-11-303-8/+13
| * | | | | Pipelines tabsFilipa Lacerda2016-11-303-5/+132
* | | | | | Merge branch '22781-user-generated-permalinks' into 'master' Fatih Acet2016-12-013-30/+35
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | remove underscore from user-content id namespace22781-user-generated-permalinksMike Greiling2016-11-301-1/+1
| * | | | | remove setTimeout wrapper for location hash correctionMike Greiling2016-11-301-3/+1
| * | | | | prevent anchor tag outline on :focus or :target pseudo-classMike Greiling2016-11-301-0/+1
View Lorry Controller Status