summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-06396-3768/+5254
|\
| * Merge branch 'glm-shorthand-reference' into 'master' Sean McGivern2016-12-0611-73/+71
| |\
| | * Add shorthand support to gitlab markdown referencesOswaldo Ferreira2016-12-0211-73/+71
| * | Merge branch 'fix/authorize-users-into-imported-gitlab-project' into 'master' Sean McGivern2016-12-061-0/+1
| |\ \
| | * | Authorize users into imported GitLab projectfix/authorize-users-into-imported-gitlab-projectAhmad Sherif2016-12-051-0/+1
| * | | Merge branch '25202-fix-mr-widget-content-wrapping' into 'master' Jacob Schatz2016-12-061-0/+5
| |\ \ \
| | * | | Fixed MR widget content wrapping for XS viewportsRyan Harris2016-12-051-0/+5
| * | | | Merge branch 'issue_25064' into 'security' Douwe Maan2016-12-061-5/+8
| * | | | Merge branch 'remove-errors-scss' into 'master' Jacob Schatz2016-12-051-16/+0
| |\ \ \ \
| | * | | | Remove unused errors cssremove-errors-scssAnnabel Dunstone Gray2016-12-051-16/+0
| | | |/ / | | |/| |
| * | | | Merge branch 'remove-votes-scss' into 'master' Jacob Schatz2016-12-051-4/+0
| |\ \ \ \
| | * | | | Remove unused votes.scssremove-votes-scssAnnabel Dunstone Gray2016-12-051-4/+0
| | |/ / /
| * | | | Merge branch 'feature/admin-user-groups-link' into 'master' Alfredo Sumaran2016-12-051-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | The admin user projects view now has a clickable group linkJames Gregory2016-12-021-1/+1
| * | | | Merge branch '25221-fix-build-status-overflow-mobile' into 'master' Alfredo Sumaran2016-12-051-0/+1
| |\ \ \ \
| | * | | | Fixed top margin for Builds page status header informationRyan Harris2016-12-031-0/+1
| * | | | | Merge branch 'reduce-font-size' into 'master' Jacob Schatz2016-12-0513-19/+19
| |\ \ \ \ \
| | * | | | | Reduce base font sizes across appreduce-font-sizeAnnabel Dunstone Gray2016-12-0213-19/+19
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'issues/1608-text' into 'master' Sean McGivern2016-12-052-2/+2
| |\ \ \ \ \
| | * | | | | change the date label to match the date usedBM5k2016-12-032-2/+2
| * | | | | | Merge branch 'fix-compatibility-with-ie11-for-merge-requests' into 'master' Fatih Acet2016-12-052-3/+15
| |\ \ \ \ \ \
| | * | | | | | Satisfied eslintSteffen Rauh2016-12-031-1/+1
| | * | | | | | Fix compatibility with Internet Explorer 11 for merge requestsSteffen Rauh2016-12-032-3/+15
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' Kamil TrzciƄski2016-12-056-12/+18
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-30111-580/+698
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-25208-1593/+3238
| | |\ \ \ \ \ \
| | * | | | | | | Update some docs to reflect MWPS name changeGrzegorz Bizon2016-11-211-2/+2
| | * | | | | | | Rename MWPS in user interface and feature testsGrzegorz Bizon2016-11-211-2/+2
| | * | | | | | | Rename MWPS in system notes and related testsGrzegorz Bizon2016-11-212-2/+2
| | * | | | | | | Rename MWBS service to Merge When Pipeline SucceedsGrzegorz Bizon2016-11-213-6/+11
| * | | | | | | | 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