summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix conflicting redirect searchmk-fix-redirect-matchingMichael Kozono2017-08-073-27/+61
|
* Merge branch 'dashboard-projects-controller-query-performance' into 'master'Sean McGivern2017-08-0713-19/+125
|\ | | | | | | | | Improve various parts of Dashboard::ProjectsController See merge request !13319
| * Eager load project creators for project dashboardsdashboard-projects-controller-query-performanceYorick Peterse2017-08-072-2/+8
| | | | | | | | | | This solves an N+1 query problem where for every project we'd query the creator separately just to figure out what avatar to display.
| * Memoize a user's personal projects countYorick Peterse2017-08-073-1/+33
| | | | | | | | | | | | | | | | | | | | The method User#projects_limit_left would run "personal_projects.count" but such a query is not memoized. As a result multiple calls to User#projects_limit_left would result in multiple COUNT(*) queries being executed. To work around this this commit adds User#personal_projects_count which simply memoizes the result of the COUNT(*) in an instance variable.
| * Remove redundant query from User#recent_pushYorick Peterse2017-08-072-10/+12
| | | | | | | | | | | | The "events" table has a foreign key on "events.project_id" with a cascading delete. As such it's impossible for an event to have a non-existing project ID.
| * Improve checking if projects would be returnedYorick Peterse2017-08-077-6/+72
| | | | | | | | | | | | | | | | | | | | In various places we check if the same relation would return projects. This is done using "any?" which will run a COUNT query with any LIMIT/OFFSET values still applied. To work around all this we introduce 2 helper methods that take care of doing the right thing. This leads to the produced queries being simpler and fewer queries being executed.
* | Merge branch 'bvl-nfs-circuitbreaker' into 'master'Sean McGivern2017-08-0744-41/+1482
|\ \ | | | | | | | | | | | | | | | | | | Circuitbreaker for storage paths Closes #32207, #33117, gitlab-com/infrastructure#1946, and gitlab-com/infrastructure#1775 See merge request !11449
| * | 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
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/models/repository.rb # spec/models/repository_spec.rb
| * | | 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 colors Closes #35999 See merge request !13323
| * | | | 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 page Closes #34764 See merge request !13318
| * | | | 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 navbar Closes #35935 See merge request !13282
| * | | | | Increase the z-index of the navbarnavbar-z-index-higherPhil Hughes2017-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Closes #35935
* | | | | | Merge branch 'winh-fix-duplicate-commits' into 'master'Tim Zallmann2017-08-071-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gl.Activities from Commits page Closes #36058 See merge request !13341
| * | | | | | Remove gl.Activities from Commits pagewinh2017-08-071-1/+0
| | | | | | |
* | | | | | | Merge branch 'add-assign-me-alias' into 'master'Rémy Coutable2017-08-074-6/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `/assign me` alias support for assigning issuables to oneself Closes #35304 See merge request !13334
| * | | | | | | Move `let` calls inside the `describe` block using themMehdi Lahmam2017-08-071-5/+5
| | | | | | | |
| * | | | | | | Add `/assign me` alias support for assigning issuables to oneselfMehdi Lahmam2017-08-073-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when a user wants to assign an issue/MR to himself, he needs to type his full username or select it from the suggested ones in the dropdown list. This commits suggest a faster solution which is typing `/assign me` Closes #35304.
* | | | | | | | Merge branch 'remove-tree-holder' into 'master'Phil Hughes2017-08-073-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused #tree-holder Closes #36035 See merge request !13338
| * | | | | | | | Remove unused #tree-holderremove-tree-holderClement Ho2017-08-073-3/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-35786' into 'master'Rémy Coutable2017-08-071-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a missing whitespace in "private forks you have no access to" Closes #35786 See merge request !13332
| * | | | | | | | Add a missing whitespace in "private forks you have no access to"Mehdi Lahmam2017-08-061-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fix #35786
* | | | | | | | Merge branch 'restrict-haml-javascript' into 'master'Tim Zallmann2017-08-074-0/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add custom linter for inline JavaScript to haml_lint See merge request !9742
| * | | | | | | | Add custom linter for inline JavaScript to haml_lint (!9742)winniehell2017-08-074-0/+22
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-introduce-gitaly-ruby' into 'master'Sean McGivern2017-08-071-0/+352
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 9.5 update guide, with Gitaly specifics Closes gitaly#416 See merge request !13309
| * | | | | | | | Change spelling of gitlab-shellJacob Vosmaer2017-08-071-1/+1
| | | | | | | | |
| * | | | | | | | Add 9.5 update guide, with Gitaly specificsJacob Vosmaer2017-08-041-0/+352
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '32300__expose_more_attributes' into 'master'Rémy Coutable2017-08-074-17/+37
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Expose more attributes to unauthenticated GET /projects/:id See merge request !13283
| * | | | | | | Expose more attributes to unauthenticated GET /projects/:idTony2017-08-034-17/+37
| | | | | | | |
* | | | | | | | Merge branch 'translation_missing_items_to_i18n' into 'master'test-triggerRémy Coutable2017-08-0710-45/+91
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synchronous zanata community contribution translation See merge request !13266
| * | | | | | | | Synchronous zanata community contribution translationHuang Tao2017-08-0710-45/+91
|/ / / / / / / /
* | | | | | | | Merge branch '35852_add_korean_translations_to_i18n' into 'master'Rémy Coutable2017-08-073-1/+1209
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Korean translation to i18n Closes #35852 See merge request !13243
| * | | | | | | Add Korean translation to i18nHuang Tao2017-08-073-1/+1209
|/ / / / / / /
* | | | | | | Merge branch 'winh-upgrade-haml_lint' into 'master'Douwe Maan2017-08-074-6/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade haml_lint Gem to 0.26.0 See merge request !13304
| * | | | | | | Upgrade haml_lint Gem to 0.26.0Winnie Hellmann2017-08-074-6/+22
|/ / / / / / /
* | | | | | | Merge branch 'mattermost_fixes' into 'master'Sean McGivern2017-08-073-9/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Mattermost integration See merge request !13305
| * | | | | | | Fix Mattermost integrationmattermost_fixesValery Sizov2017-08-043-9/+28
| | | | | | | |
* | | | | | | | Merge branch 'docs/upgrades-for-background-migrations' into 'master'Sean McGivern2017-08-073-17/+75
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the guides for updating GitLab and adding background migrations See merge request !13284
| * | | | | | | | Mention schema migrations and patch releasesdocs/upgrades-for-background-migrationsYorick Peterse2017-08-041-0/+6
| | | | | | | | |
View Lorry Controller Status