summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't memoize storage configuration on `FsShardsCheck`bvl-transient-failure-health-controller-specBob Van Landuyt2017-09-211-2/+2
* Merge branch 'docs-updates-sharing-permissions-and-project-filter' into 'master'Achilleas Pipinellis2017-09-211-0/+0
|\
| * new sharing permissionsMike Bartlett2017-09-211-0/+0
* | Merge branch '37220-es-modules' into 'master'Phil Hughes2017-09-2141-870/+931
|\ \
| * | Exports all the methods in the same place37220-es-modulesFilipa Lacerda2017-09-181-25/+28
| * | Merge branch 'master' into 37220-es-modulesMike Greiling2017-09-18357-4475/+7015
| |\ \
| * | | Fix context for jquery eventFilipa Lacerda2017-09-151-7/+5
| * | | fixed mr widget options specPhil Hughes2017-09-131-3/+2
| * | | fixed todos specPhil Hughes2017-09-122-28/+15
| * | | Merge branch 'master' into 37220-es-modulesFilipa Lacerda2017-09-12101-1184/+1735
| |\ \ \
| * | | | fixed location.pathname not being resetPhil Hughes2017-09-121-1/+1
| * | | | Import modules instead of using the ones in global namespaceFilipa Lacerda2017-09-0932-170/+233
| * | | | Use modules in common utilsFilipa Lacerda2017-09-0914-769/+779
* | | | | Merge branch 'feature/plantuml-restructured-text' into 'master'Douwe Maan2017-09-213-3/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Upgrade gitlab-markup gemMarkus Koller2017-09-203-3/+8
* | | | | Merge branch '38088-remove-banner-to-customize-experience' into 'master'Douwe Maan2017-09-216-157/+0
|\ \ \ \ \
| * | | | | Deleted another Fixture due to User Callout38088-remove-banner-to-customize-experienceTim Zallmann2017-09-201-30/+0
| * | | | | Fixture Creation removedTim Zallmann2017-09-201-5/+0
| * | | | | Deleted Karma Specs for userCalloutTim Zallmann2017-09-201-49/+0
| * | | | | Removed User Callout for Customer ExperienceTim Zallmann2017-09-204-73/+0
* | | | | | Merge branch 'events-redundant-where' into 'master'Rémy Coutable2017-09-213-7/+12
|\ \ \ \ \ \
| * | | | | | Remove redundant WHERE from event queriesevents-redundant-whereYorick Peterse2017-09-203-7/+12
* | | | | | | Merge branch 'remove-use-key-worker' into 'master'Rémy Coutable2017-09-218-65/+116
|\ \ \ \ \ \ \
| * | | | | | | Stop using Sidekiq for updating Key#last_used_atremove-use-key-workerYorick Peterse2017-09-208-65/+116
| |/ / / / / /
* | | | | | | Merge branch 'resolve-discussions-btn' into 'master'Phil Hughes2017-09-211-14/+6
|\ \ \ \ \ \ \
| * | | | | | | Make resolve discussion icon grayresolve-discussions-btnAnnabel Dunstone Gray2017-09-201-14/+6
* | | | | | | | Merge branch '10-0-sync-master' into 'master'Simon Knox2017-09-2116-79/+19
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJarka Kadlecova2017-09-2116-79/+19
| |\ \ \ \ \ \ \ \ |/ / / / / / / / /
| * | | | | | | | Update CHANGELOG.md for 9.5.5Simon Knox2017-09-1816-79/+19
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'fix-image-diff-swipe-handle' into 'master'Annabel Dunstone Gray2017-09-202-1/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix image diff swipe handle offset to correctly align with the framefix-image-diff-swipe-handleClement Ho2017-09-202-1/+7
* | | | | | | | Merge branch '38049-fix-resolve-in-new-issue-btn' into 'master'Annabel Dunstone Gray2017-09-203-8/+17
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix the "resolve discussion in a new issue" buttonNick Thomas2017-09-203-8/+17
* | | | | | | | Merge branch '37862-breadcrumbs-mobile' into 'master'Tim Zallmann2017-09-202-5/+12
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Vertically center hamburger button37862-breadcrumbs-mobileAnnabel Dunstone Gray2017-09-182-7/+3
| * | | | | | | Increase tap target on hamburger menuAnnabel Dunstone Gray2017-09-152-3/+8
| * | | | | | | Fix mobile sidebar button to match height of desktop breadcrumbsAnnabel Dunstone Gray2017-09-141-0/+6
* | | | | | | | Merge branch 'gitlab-git-popen' into 'master'Douwe Maan2017-09-207-13/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Use Gitlab::Git's Popen on that module's codegitlab-git-popenAlejandro Rodríguez2017-09-207-13/+19
* | | | | | | | | Merge branch '32796-tighten-up-remove-old-while-backing-up-gitlab' into 'master'Rémy Coutable2017-09-202-10/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Tighten up remove_old regex from gitlab backup manager.32796-tighten-up-remove-old-while-backing-up-gitlabTiago Botelho2017-09-202-10/+38
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'workhorse-3.1.0' into 'master'Rémy Coutable2017-09-201-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use gitlab-workhorse 3.1.0Jacob Vosmaer2017-09-201-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-counts-caching' into 'master'Douwe Maan2017-09-2012-15/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix refreshing of issues/MR count cachesfix-counts-cachingYorick Peterse2017-09-1912-15/+28
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-autodevops-monitoring' into 'master'Kamil Trzciński2017-09-201-4/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Support new auto-deploy helm chartfix-autodevops-monitoringAlessio Caiazza2017-09-201-4/+0
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '37713-enable-ee_compat_check-for-forks' into 'master'Rémy Coutable2017-09-203-4/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Update ee_compat_check for community contributors37713-enable-ee_compat_check-for-forksLin Jen-Shin2017-09-151-1/+6
| * | | | | | | | Enable ee_compat_check for forks, but not EELin Jen-Shin2017-09-152-3/+6