summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-2837-63/+2295
| | | | | | | | EE: Trace as artifacts (FileStorage and ObjectStorage) Closes #4171 See merge request gitlab-org/gitlab-ee!4258
* Merge branch 'use-send-url-for-incompatible-runners' into 'master'Grzegorz Bizon2018-02-287-8/+73
| | | | | | Support SendURL for performing indirect download of artifacts if clients does… See merge request gitlab-org/gitlab-ee!4401
* Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-28111-1371/+3972
| | | | | | | | Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867
* Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵Kamil Trzciński2018-02-282209-19752/+43171
|\ | | | | | | object-storage-ee-to-ce-backport
| * Merge branch ↵Yorick Peterse2018-01-083-0/+468
| |\ | | | | | | | | | | | | | | | | | | | | | | | | '40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetes' into 'master' Migrate existing data from KubernetesService to Clusters::Platforms::Kubernetes Closes #40418 See merge request gitlab-org/gitlab-ce!15589
| | * Add memoization for properties40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetesShinya Maeda2018-01-081-4/+10
| | |
| | * Fix static analysysShinya Maeda2018-01-081-9/+9
| | |
| | * Disable STI of ActiveRecord. Refactoring specs.Shinya Maeda2018-01-082-66/+184
| | |
| | * Fix StaticSnalysysShinya Maeda2018-01-081-1/+1
| | |
| | * Fix change logShinya Maeda2018-01-081-1/+1
| | |
| | * Add changelogShinya Maeda2018-01-081-0/+5
| | |
| | * Revert bulk_insert and bring back AR insert(one by one)Shinya Maeda2018-01-082-64/+54
| | |
| | * Add a new test for emptified paramsShinya Maeda2018-01-081-2/+19
| | |
| | * Use batch update for Service deactivationShinya Maeda2018-01-081-4/+5
| | |
| | * Fix query to look for proper unmanaged kubernetes serviceShinya Maeda2018-01-081-17/+12
| | |
| | * Fix static anylysyShinya Maeda2018-01-082-9/+10
| | |
| | * Use bulk_insert instead of AR createShinya Maeda2018-01-081-12/+45
| | |
| | * Opitmize migration process by using both unmanaged_kubernetes_service and ↵Shinya Maeda2018-01-082-40/+36
| | | | | | | | | | | | kubernetes_service_without_template
| | * Avoid quotes in ActiveRecord queryShinya Maeda2018-01-081-4/+4
| | |
| | * Use explicit namespace for avoiding reference from application codeShinya Maeda2018-01-081-13/+16
| | |
| | * Add logic to swtich environment_scope by the situationShinya Maeda2018-01-082-33/+69
| | |
| | * Add env_scope testsShinya Maeda2018-01-082-0/+33
| | |
| | * Fix testShinya Maeda2018-01-081-187/+52
| | |
| | * Fix commentsShinya Maeda2018-01-081-10/+10
| | |
| | * Restructure specShinya Maeda2018-01-081-160/+229
| | |
| | * Fix migration file typos and reorder Table definitionShinya Maeda2018-01-081-25/+21
| | |
| | * Fix unmanaged_kubernetes_service scope for multiple clustersShinya Maeda2018-01-081-17/+27
| | |
| | * Add test. Disable KubernetesService when migratedShinya Maeda2018-01-082-11/+201
| | |
| | * Migrate existing data from KubernetesService to Clusters::Platforms::KubernetesShinya Maeda2018-01-081-0/+104
| | |
| * | Merge branch '41754-update-scss-lint-to-0-56-0' into 'master'Rémy Coutable2018-01-083-5/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade scss-lint to 0.56.0 Closes #41754 See merge request gitlab-org/gitlab-ce!16278
| | * | Update scss-lint to 0.56.0Takuya Noguchi2018-01-083-5/+17
| | |/
| * | Merge branch 'delay-background-migrations' into 'master'Rémy Coutable2018-01-088-11/+110
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Run background migrations with a minimum interval Closes #41624 See merge request gitlab-org/gitlab-ce!16230
| | * | Run background migrations with a minimum intervaldelay-background-migrationsYorick Peterse2018-01-058-11/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a minimum interval to BackgroundMigrationWorker, ensuring background migrations of the same class only run once every 5 minutes. This prevents a thundering herd problem where scheduled migrations all run at once due to their delays having been expired (e.g. as the result of a queue being paused for a long time). If a job was recently executed it's rescheduled with a delay that equals the remaining time of the job's lease. This means that if the lease expires in two minutes we only need to wait two minutes, instead of five. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/41624
| * | | Merge branch '149-qa-honor-chrome-headless-false' into 'master'Grzegorz Bizon2018-01-084-7/+114
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Allow QA tests to run with `CHROME_HEADLESS=false`" Closes gitlab-qa#149 See merge request gitlab-org/gitlab-ce!16248
| | * | | Resolve "Allow QA tests to run with `CHROME_HEADLESS=false`"Brett Walker2018-01-084-7/+114
| |/ / /
| * | | Merge branch '40549-render-emoj-in-groups-overview' into 'master'Sean McGivern2018-01-086-3/+44
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "No Rendering of emoji's in Group-Overview after update" Closes #40549 See merge request gitlab-org/gitlab-ce!16098
| | * | | Rendering of emoji's in Group-OverviewJacopo2017-12-246-3/+44
| | | | | | | | | | | | | | | | | | | | Allows rendering of emoji's in the Group Overview.
| * | | | Merge branch 'remove-commit-tree' into 'master'Sean McGivern2018-01-086-9/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove the Commit#tree method See merge request gitlab-org/gitlab-ce!16236
| | * | | | Remove the Commit#tree methodremove-commit-treeJacob Vosmaer2018-01-046-9/+10
| | | | | |
| * | | | | Merge branch '38056-remove-unused-option' into 'master'Phil Hughes2018-01-083-4/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused push_code_to_protected_branches Closes #38056 See merge request gitlab-org/gitlab-ce!16253
| | * | | | | Remove unused push_code_to_protected_branches38056-remove-unused-optionLin Jen-Shin2018-01-053-4/+0
| | | | | | |
| * | | | | | Merge branch 'gitaly-fetch-internal-remote' into 'master'Sean McGivern2018-01-085-30/+66
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate RemoteService.FetchInternalRemote Gitaly RPC Closes gitaly#857 See merge request gitlab-org/gitlab-ce!16140
| | * | | | | | Incorporate RemoteService.FetchInternalRemote Gitaly RPCgitaly-fetch-internal-remoteAlejandro Rodríguez2018-01-055-30/+66
| | | | | | | |
| * | | | | | | Merge branch 'mb-invites-feature-to-rspec' into 'master'Rémy Coutable2018-01-083-125/+97
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move invites spinach test to Rspec See merge request gitlab-org/gitlab-ce!16126
| | * | | | | | | Move invites spinach test to RspecSemyon Pupkov2017-12-253-125/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
| * | | | | | | | Merge branch 'mv-explore-groups-spinach-to-rspec' into 'master'Rémy Coutable2018-01-083-193/+87
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move explore groups spinach test to RSpec See merge request gitlab-org/gitlab-ce!16129
| | * | | | | | | | Move explore groups spinach test to RSpecSemyon Pupkov2017-12-253-193/+87
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
| * | | | | | | | Merge branch '38030-add-graph-value-to-hover' into 'master'Tim Zallmann2018-01-089-356/+364
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add graph value to hover" Closes #38030 See merge request gitlab-org/gitlab-ce!16261
| | * | | | | | | | Resolve "Add graph value to hover"Mike Greiling2018-01-089-356/+364
| |/ / / / / / / /
| * | | | | | | | Merge branch 'issue-40190' into 'master'Phil Hughes2018-01-083-3/+20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix slash commands dropdown description See merge request gitlab-org/gitlab-ce!16125
View Lorry Controller Status