summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Re-add column locked_at on migration rollback31207-clean-locked-merge-requestsOswaldo Ferreira2017-08-071-1/+1
* Move locked_at removal to post-deployment migrationOswaldo Ferreira2017-08-073-2/+3
* Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-0728-54/+193
* Merge branch '34028-collapse-sidebar' into 'master'Phil Hughes2017-08-079-2/+159
|\
| * Add changelog34028-collapse-sidebarAnnabel Dunstone Gray2017-08-072-4/+4
| * Make contextual sidebar collapsibleAnnabel Dunstone Gray2017-08-078-2/+159
* | Merge branch 'wiki_title' into 'master'Robert Speicher2017-08-0710-55/+95
|\ \
| * | Allow wiki pages to be renamed in the UIwendy04022017-08-0310-55/+95
* | | Merge branch 'sh-bump-gitlab-shell-5.8.0' into 'master'Robert Speicher2017-08-071-1/+1
|\ \ \
| * | | Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14sh-bump-gitlab-shell-5.8.0Stan Hu2017-08-071-1/+1
* | | | Merge branch 'gitaly-386-shell-config' into 'master'Robert Speicher2017-08-072-0/+3
|\ \ \ \
| * | | | fix testsgitaly-386-shell-configKim "BKC" Carlbäcker2017-08-041-0/+2
| * | | | Have raketask tell gitaly where to find shellKim "BKC" Carlbäcker2017-08-041-0/+1
* | | | | Merge branch 'add-star-for-action-scope' into 'master'Rémy Coutable2017-08-075-16/+139
|\ \ \ \ \
| * | | | | Rename user_can_admin? because it's more accurateadd-star-for-action-scopeLin Jen-Shin2017-08-072-3/+3
| * | | | | Add changelog entryLin Jen-Shin2017-08-071-0/+4
| * | | | | Merge remote-tracking branch 'upstream/master' into add-star-for-action-scopeLin Jen-Shin2017-08-071001-9655/+6649
| |\ \ \ \ \
| * | | | | | Cleanup tests and add admin_container_image toLin Jen-Shin2017-08-023-27/+33
| * | | | | | Implemented star auth capabilities on docker registry to enable deletion of i...Maxime Visonneau2017-08-021-6/+28
| * | | | | | Merge remote-tracking branch 'upstream/master' into add-star-for-action-scopeLin Jen-Shin2017-08-024511-50696/+129280
| |\ \ \ \ \ \
| * | | | | | | fix unit testing for adminJean Praloran2017-05-301-1/+1
| * | | | | | | fix typo and checkJean Praloran2017-05-302-8/+2
| * | | | | | | add test and rebaseJean Praloran2017-05-302-2/+97
| * | | | | | | change ability requirementJean Praloran2017-05-301-1/+1
| * | | | | | | add star for action scope, in order to delete image from registryjean2017-05-301-0/+2
* | | | | | | | Merge branch 'dashboard-projects-controller-query-performance' into 'master'Sean McGivern2017-08-0713-19/+125
|\ \ \ \ \ \ \ \
| * | | | | | | | Eager load project creators for project dashboardsdashboard-projects-controller-query-performanceYorick Peterse2017-08-072-2/+8
| * | | | | | | | Memoize a user's personal projects countYorick Peterse2017-08-073-1/+33
| * | | | | | | | Remove redundant query from User#recent_pushYorick Peterse2017-08-072-10/+12
| * | | | | | | | Improve checking if projects would be returnedYorick Peterse2017-08-077-6/+72
* | | | | | | | | Merge branch 'bvl-nfs-circuitbreaker' into 'master'Sean McGivern2017-08-0744-41/+1482
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use correct `Environment`-class within `Gitlab` namespaceBob Van Landuyt2017-08-073-4/+4
| * | | | | | | | | GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandErrorBob Van Landuyt2017-08-072-18/+19
| * | | | | | | | | Use `broken_storage` in the fs_shards_spec.Bob Van Landuyt2017-08-071-1/+1
| * | | | | | | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan2017-08-07159-4901/+2408
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use ruby's `File.stat` to check storage availabilityBob Van Landuyt2017-08-042-22/+27
| * | | | | | | | | | Use a Struct to keep track of failure infoBob Van Landuyt2017-08-041-11/+7
| * | | | | | | | | | Only track accessibility onceBob Van Landuyt2017-08-042-11/+46
| * | | | | | | | | | Use `keys` instead of `scan_each`Bob Van Landuyt2017-08-043-21/+13
| * | | | | | | | | | Move hostname to Gitlab::EnvironmentBob Van Landuyt2017-08-045-4/+10
| * | | | | | | | | | Make sure the check works for paths with spaces.Bob Van Landuyt2017-08-042-1/+23
| * | | | | | | | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-0440-37/+1421
* | | | | | | | | | | Merge branch 'new-sidebar-context-header-hover-color' into 'master'Annabel Dunstone Gray2017-08-071-24/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed sidebar context header hover colorsPhil Hughes2017-08-071-24/+13
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '34764-rename-to-overview' into 'master'Annabel Dunstone Gray2017-08-075-7/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 34764 Rename about to overview for group and project page34764-rename-to-overviewtauriedavis2017-08-045-7/+11
* | | | | | | | | | | | Merge branch 'navbar-z-index-higher' into 'master'Annabel Dunstone Gray2017-08-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Increase the z-index of the navbarnavbar-z-index-higherPhil Hughes2017-08-031-1/+1
* | | | | | | | | | | | Merge branch 'winh-fix-duplicate-commits' into 'master'Tim Zallmann2017-08-071-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove gl.Activities from Commits pagewinh2017-08-071-1/+0
View Lorry Controller Status