summaryrefslogtreecommitdiff
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-1692-873/+2072
| |\
| * | 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-1592-919/+1180
| |\ \
| * | | 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
* | | | Merge branch '42046-fork-icon' into 'master'41936-install-btnFatih Acet2018-01-163-3/+8
|\ \ \ \
| * | | | Resolve "Icons on forks page are to big"Simon Knox2018-01-163-3/+8
|/ / / /
* | | | Merge branch '41796-update-auto-deployed-prometheus-scrape-config' into 'master'Kamil Trzciński2018-01-161-119/+81
|\ \ \ \
| * | | | Update prometheus.yml to reflect current Omnibus version41796-update-auto-deployed-prometheus-scrape-configJoshua Lambert2018-01-151-119/+81
* | | | | Merge branch '41666-cannot-search-with-keyword-merge' into 'master'Rémy Coutable2018-01-168-23/+53
|\ \ \ \ \
| * | | | | Only highlight search results under the highlighting size limit41666-cannot-search-with-keyword-mergeSean McGivern2018-01-163-0/+14
| * | | | | Fix project search results for digits surrounded by colonsSean McGivern2018-01-165-23/+39
* | | | | | 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 'master' into 'master'docs-comm-article-phoenix-app-gitlab-ciRémy Coutable2018-01-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in doc_styleguide.mdMica2018-01-151-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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 '41476-enable-project-milestons-deletion-via-api' into 'master'Rémy Coutable2018-01-164-0/+67
|\ \ \ \ \ \ \
| * | | | | | | Enables Project Milestone Deletion via APIJacopo2018-01-164-0/+67
|/ / / / / / /
* | | | | | | Merge branch 'issue_41460' into 'master'Sean McGivern2018-01-164-23/+36
|\ \ \ \ \ \ \
| * | | | | | | Fix error on changes tab when merge request cannot be createdissue_41460Felipe Artur2018-01-154-23/+36
* | | | | | | | 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 '42074-rspec-spec-lib-gitlab-background_migration-deserialize_me...Rémy Coutable2018-01-161-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prevent background migration spec from polluting later modelsSean McGivern2018-01-161-0/+4
* | | | | | | | | | Merge branch 'mr-status-box-update' into 'master'Filipa Lacerda2018-01-165-13/+61
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixed merge request specsPhil Hughes2018-01-161-2/+2
| * | | | | | | | | | Fixed merge request status badge not updating after mergingmr-status-box-updatePhil Hughes2018-01-155-11/+59
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'feature/migrate-commit-uri-to-gitaly' into 'master'Sean McGivern2018-01-163-16/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Migrate Commit#uri_type to Gitalyfeature/migrate-commit-uri-to-gitalyAhmad Sherif2018-01-155-18/+55
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch '36571-ignore-root-in-repo' into 'master'Sean McGivern2018-01-163-2/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move Regexp.escape(), fix formatting on tests.Andrew McCallum2018-01-162-4/+4
| * | | | | | | | | | Account for query of only forward slash(es).Andrew McCallum2018-01-152-2/+9
| * | | | | | | | | | Create intermediary variable for query value with leading slashes removed.Andrew McCallum2018-01-151-1/+3
| * | | | | | | | | | Fix spelling mistake.Andrew McCallum2018-01-151-2/+2
| * | | | | | | | | | Add space after comma per layout guidelines.Andrew McCallum2018-01-151-1/+1
| * | | | | | | | | | Update 36571-ignore-root-in-repo.ymlAndrew McCallum2018-01-151-1/+1
| * | | | | | | | | | Add changelogAndrew McCallum2018-01-151-0/+5
| * | | | | | | | | | Add scenario of searching within context of repository with root slash to tests.Andrew McCallum2018-01-151-0/+5