summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added tests for removing soft removed objectsremove-soft-removalsYorick Peterse2018-01-102-12/+87
|
* Remove soft removals related codeYorick Peterse2018-01-0838-105/+262
| | | | | | | | | | | | | | This removes all usage of soft removals except for the "pending delete" system implemented for projects. This in turn simplifies all the query plans of the models that used soft removals. Since we don't really use soft removals for anything useful there's no point in keeping it around. This _does_ mean that hard removals of issues (which only admins can do if I'm not mistaken) can influence the "iid" values, but that code is broken to begin with. More on this (and how to fix it) can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/31114. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
* 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
| * | | | | | Fix slash commands dropdown descriptionMaurizio De Santis2018-01-083-3/+20
|/ / / / / /
* | | | | | Merge branch '41244-issue-board-shortcut-working-while-no-issues' into 'master'Phil Hughes2018-01-088-18/+90
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disables the shortcut to the issue boards when issues are disabled Closes #41244 See merge request gitlab-org/gitlab-ce!16020
| * | | | | | disables the shortcut to the issue boards when issues are disabledChristiaan Van den Poel2018-01-088-18/+90
|/ / / / / /
* | | | | | Merge branch '3968-protected-branch-is-not-set-for-default-branch-on-import' ↵Douwe Maan2018-01-087-20/+89
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Protected branch is now created for default branch on import Closes #3968 See merge request gitlab-org/gitlab-ce!16198
| * | | | | | Protected branch is now created for default branch on import3968-protected-branch-is-not-set-for-default-branch-on-importTiago Botelho2018-01-067-20/+89
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch ↵Kamil Trzciński2018-01-0715-76/+357
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled' into 'master' Resolve "Redirect to GCP page if users try to create a cluster but the account is not enabled" Closes #39957 and #41410 See merge request gitlab-org/gitlab-ce!15665
| * | | | | | Fix check_gcp_project_billing_worker_spec.rbKamil Trzciński2018-01-071-1/+1
| | | | | | |
| * | | | | | Set timeout to billing information39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabledKamil Trzciński2018-01-071-1/+4
| | | | | | |
| * | | | | | Refactor GCP session token exchange schemeMatija Čupić2018-01-073-12/+23
| | | | | | |
| * | | | | | Separate let and subject line in specMatija Čupić2018-01-071-0/+1
| | | | | | |
| * | | | | | Add CHANGELOG entryMatija Čupić2018-01-061-0/+5
| | | | | | |
| * | | | | | Merge branch 'master' into ↵Matija Čupić2018-01-0680-1361/+9800
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | | | | | | Store OAuth token in Redis for worker to pick upMatija Čupić2018-01-062-2/+7
| | | | | | | |
| * | | | | | | Use token from redis in gcp project billing workerMatija Čupić2018-01-062-15/+46
| | | | | | | |
| * | | | | | | Remove check_gcp_project_billing queue from sidekiqMatija Čupić2018-01-061-1/+0
| | | | | | | |
| * | | | | | | Merge branch 'master' into ↵Matija Čupić2018-01-05175-754/+2888
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | | | | | | | Move worker to gcp_project namespaceMatija Čupić2018-01-052-1/+2
| | | | | | | | |
| * | | | | | | | Use token hash for redis keyMatija Čupić2018-01-051-2/+2
| | | | | | | | |
| * | | | | | | | Return list of billing enabled projectsMatija Čupić2018-01-054-9/+10
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into ↵Matija Čupić2018-01-051044-7148/+10895
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | | | | | | | | Change CheckGcpProjectBillingWorker lease to 15sMatija Čupić2018-01-051-1/+1
| | | | | | | | | |
| * | | | | | | | | Remove polling interval from GcpControllerMatija Čupić2018-01-051-2/+0
| | | | | | | | | |
| * | | | | | | | | Remove GCP cluster check page placeholderMatija Čupić2018-01-051-1/+0
| | | | | | | | | |
| * | | | | | | | | Add url to link in new GCP cluster header partialMatija Čupić2017-12-221-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix clusters/gcp feature specMatija Čupić2017-12-211-0/+1
| | | | | | | | | |
| * | | | | | | | | Fix use of pending decorator in specMatija Čupić2017-12-211-3/+2
| | | | | | | | | |
| * | | | | | | | | Add CheckGcpProjectBilling worker to all_queuesMatija Čupić2017-12-211-0/+1
| | | | | | | | | |
| * | | | | | | | | Implement GCP billing check in cluster formMatija Čupić2017-12-213-9/+38
| | | | | | | | | |
| * | | | | | | | | Remove actions for async GCP project billing checkMatija Čupić2017-12-213-222/+11
| | | | | | | | | |
| * | | | | | | | | Make GCP billing check mock more specificMatija Čupić2017-12-211-1/+1
| | | | | | | | | |
| * | | | | | | | | Mark the gcp check page feature spec pendingMatija Čupić2017-12-211-1/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into ↵Matija Čupić2017-12-21820-5769/+11772
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | | | | | | | | | Update GCP feature spec with check page flowMatija Čupić2017-12-161-67/+86
| | | | | | | | | | |
View Lorry Controller Status