summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-161-0/+9
* Merge branch 'fl-ipythin-10-3' into 'security-10-3'Phil Hughes2018-01-162-2/+33
* Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-162-1/+2
* Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-1611-43/+98
* Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-161-6/+22
* Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-161-1/+1
* Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-164-18/+18
* Merge branch 'label-xss-10-3' into 'security-10-3'Jacob Schatz2018-01-161-1/+1
* Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-inte...Stan Hu2018-01-161-0/+5
* fix readability xterm colorsDanny2018-01-161-15/+14
* Merge branch '40818-last-push-widget-does-not-appear-after-pushing-new-commit...Rémy Coutable2018-01-161-1/+2
|\
| * Last push widget will show banner for new pushes to previously merged branchDrew Blessing2018-01-151-1/+2
* | Merge branch 'fix/pipeline-header-padding' into 'master'Filipa Lacerda2018-01-162-0/+2
|\ \
| * | Add pipeline header paddingGeorge Tsiolis2018-01-162-0/+2
* | | Merge branch 'winh-style-modals' into 'master'Tim Zallmann2018-01-166-12/+37
|\ \ \
| * | | Adjust modal style to new designwinh-style-modalsWinnie Hellmann2018-01-116-12/+37
* | | | Merge branch 'dispatcher-projects-c' into 'master'Phil Hughes2018-01-168-41/+85
|\ \ \ \
| * | | | typodispatcher-projects-cSimon Knox2018-01-161-1/+1
| * | | | add missing pages import for projects:compare:*Simon Knox2018-01-162-2/+8
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into dispatcher-proj...Simon Knox2018-01-1628-81/+426
| |\ \ \ \
| * | | | | fix exportsSimon Knox2018-01-152-2/+6
| * | | | | fix broken import path from mergeSimon Knox2018-01-151-1/+1
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into dispatcher-proj...Simon Knox2018-01-1543-268/+411
| |\ \ \ \ \
| * | | | | | export instancesSimon Knox2018-01-122-2/+2
| * | | | | | remove unusedSimon Knox2018-01-121-1/+0
| * | | | | | dispatcher pages for projects:clustersSimon Knox2018-01-123-12/+12
| * | | | | | dispatcher changes for projects:commit* viewsSimon Knox2018-01-125-24/+59
* | | | | | | Resolve "Icons on forks page are to big"Simon Knox2018-01-162-3/+3
* | | | | | | Merge branch '41666-cannot-search-with-keyword-merge' into 'master'Rémy Coutable2018-01-162-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Only highlight search results under the highlighting size limit41666-cannot-search-with-keyword-mergeSean McGivern2018-01-161-0/+2
| * | | | | | | Fix project search results for digits surrounded by colonsSean McGivern2018-01-161-1/+1
* | | | | | | | Merge branch '41921-follow-up-fixes' into 'master'Rémy Coutable2018-01-161-18/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor of buttons _dropdown partialMark Fletcher2018-01-161-18/+8
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'fix/profile-gpg-keys-column-width' into 'master'Rémy Coutable2018-01-161-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Change user settings column widthGeorge Tsiolis2018-01-161-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'fix/activity-nav-inconsistent-capitalization' into 'master'Rémy Coutable2018-01-162-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix top-area inconsistent capitalizationGeorge Tsiolis2018-01-162-4/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'issue_41460' into 'master'Sean McGivern2018-01-162-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix error on changes tab when merge request cannot be createdissue_41460Felipe Artur2018-01-152-6/+6
* | | | | | | | | Merge branch 'dispatcher-milestones' into 'master'Filipa Lacerda2018-01-166-7/+37
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixed eslintdispatcher-milestonesPhil Hughes2018-01-151-1/+0
| * | | | | | | | | correctly init GFMPhil Hughes2018-01-153-4/+4
| * | | | | | | | | Added imports for milestone dispatcher routesPhil Hughes2018-01-156-6/+37
* | | | | | | | | | Merge branch 'mr-status-box-update' into 'master'Filipa Lacerda2018-01-162-9/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed merge request status badge not updating after mergingmr-status-box-updatePhil Hughes2018-01-152-9/+8
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'feature/migrate-commit-uri-to-gitaly' into 'master'Sean McGivern2018-01-161-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Migrate Commit#uri_type to Gitalyfeature/migrate-commit-uri-to-gitalyAhmad Sherif2018-01-151-4/+4
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '36571-ignore-root-in-repo' into 'master'Sean McGivern2018-01-161-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move Regexp.escape(), fix formatting on tests.Andrew McCallum2018-01-161-2/+2
| * | | | | | | | | | Account for query of only forward slash(es).Andrew McCallum2018-01-151-2/+2