summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | | Create intermediary variable for query value with leading slashes removed.Andrew McCallum2018-01-151-1/+3
| * | | | | | | | | Add space after comma per layout guidelines.Andrew McCallum2018-01-151-1/+1
| * | | | | | | | | Strip off leading slashes when searching in context of repository.Andrew McCallum2018-01-151-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'issue-30101' into 'master'Rémy Coutable2018-01-161-15/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update 'removed assignee' note to include old assignee referenceMaurizio De Santis2018-01-091-15/+8
* | | | | | | | | | Merge branch 'sh-remove-shared-runners-and-more' into 'master'Grzegorz Bizon2018-01-161-3/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove erroneous text in shared runners page that suggested more runners avai...sh-remove-shared-runners-and-moreStan Hu2018-01-151-3/+0
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sh-optimize-ci-build-project' into 'master'Grzegorz Bizon2018-01-163-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Ensure CI pipelines and builds have the correction project associationsStan Hu2018-01-143-3/+4
| |/ / / / / / / /
* | | | | | | | | Merge branch '1819-override-ce' into 'master'Rémy Coutable2018-01-151-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 1819-override-ceLin Jen-Shin2018-01-12507-6689/+9678
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Skip sha_attribute if we're checking staticallyLin Jen-Shin2017-12-261-0/+1
* | | | | | | | | | Merge branch '19493-fork-does-not-protect-default-branch' into 'master'Douwe Maan2018-01-151-4/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Fork now protects default branch on completion19493-fork-does-not-protect-default-branchTiago Botelho2018-01-151-4/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'projects-tree-tags-dispatcher-refactor' into 'master'Phil Hughes2018-01-153-12/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refactored use of for projects:tree:*projects-tree-tags-dispatcher-refactorConstance Okoghenun2018-01-152-5/+3