Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Fix slash commands dropdown description | Maurizio De Santis | 2018-01-08 | 3 | -3/+20 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch '41244-issue-board-shortcut-working-while-no-issues' into 'master' | Phil Hughes | 2018-01-08 | 8 | -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 disabled | Christiaan Van den Poel | 2018-01-08 | 8 | -18/+90 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch '3968-protected-branch-is-not-set-for-default-branch-on-import' ↵ | Douwe Maan | 2018-01-08 | 7 | -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-import | Tiago Botelho | 2018-01-06 | 7 | -20/+89 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch ↵ | Kamil Trzciński | 2018-01-07 | 15 | -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.rb | Kamil Trzciński | 2018-01-07 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Set timeout to billing information39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled | Kamil Trzciński | 2018-01-07 | 1 | -1/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Refactor GCP session token exchange scheme | Matija Čupić | 2018-01-07 | 3 | -12/+23 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Separate let and subject line in spec | Matija Čupić | 2018-01-07 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Add CHANGELOG entry | Matija Čupić | 2018-01-06 | 1 | -0/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' into ↵ | Matija Čupić | 2018-01-06 | 80 | -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 up | Matija Čupić | 2018-01-06 | 2 | -2/+7 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Use token from redis in gcp project billing worker | Matija Čupić | 2018-01-06 | 2 | -15/+46 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Remove check_gcp_project_billing queue from sidekiq | Matija Čupić | 2018-01-06 | 1 | -1/+0 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' into ↵ | Matija Čupić | 2018-01-05 | 175 | -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 namespace | Matija Čupić | 2018-01-05 | 2 | -1/+2 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Use token hash for redis key | Matija Čupić | 2018-01-05 | 1 | -2/+2 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Return list of billing enabled projects | Matija Čupić | 2018-01-05 | 4 | -9/+10 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' into ↵ | Matija Čupić | 2018-01-05 | 1044 | -7148/+10895 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled | |||||
| * | | | | | | | | | | | Change CheckGcpProjectBillingWorker lease to 15s | Matija Čupić | 2018-01-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Remove polling interval from GcpController | Matija Čupić | 2018-01-05 | 1 | -2/+0 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Remove GCP cluster check page placeholder | Matija Čupić | 2018-01-05 | 1 | -1/+0 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add url to link in new GCP cluster header partial | Matija Čupić | 2017-12-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix clusters/gcp feature spec | Matija Čupić | 2017-12-21 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix use of pending decorator in spec | Matija Čupić | 2017-12-21 | 1 | -3/+2 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add CheckGcpProjectBilling worker to all_queues | Matija Čupić | 2017-12-21 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Implement GCP billing check in cluster form | Matija Čupić | 2017-12-21 | 3 | -9/+38 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Remove actions for async GCP project billing check | Matija Čupić | 2017-12-21 | 3 | -222/+11 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Make GCP billing check mock more specific | Matija Čupić | 2017-12-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Mark the gcp check page feature spec pending | Matija Čupić | 2017-12-21 | 1 | -1/+3 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'master' into ↵ | Matija Čupić | 2017-12-21 | 820 | -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 flow | Matija Čupić | 2017-12-16 | 1 | -67/+86 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add Worker rerun action to GcpController | Matija Čupić | 2017-12-16 | 3 | -1/+61 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add CheckGcpProjectBillingWorker to sidekiq queue | Matija Čupić | 2017-12-16 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Inluce projects namespace when checking billing | Matija Čupić | 2017-12-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Handle html format in addition to json | Matija Čupić | 2017-12-16 | 2 | -1/+3 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Expand controller test suite matrix | Matija Čupić | 2017-12-16 | 5 | -46/+111 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Use 1 minute for status polling interval | Matija Čupić | 2017-12-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add lease to CheckGcpProjectBillingWorker | Matija Čupić | 2017-12-16 | 2 | -9/+38 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add check step for creating GCP clusters | Matija Čupić | 2017-12-16 | 5 | -3/+97 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Isolate CheckGcpProjectBillingWorker specreturns | Matija Čupić | 2017-12-16 | 1 | -4/+5 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add CheckGcpProjectBillingWorker | Matija Čupić | 2017-12-16 | 2 | -0/+39 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Properly CamelCase service name | Matija Čupić | 2017-12-16 | 3 | -4/+4 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add CheckGCPProjectBillingService | Matija Čupić | 2017-12-16 | 2 | -0/+38 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Change link for creating a new Google account | Matija Čupić | 2017-12-16 | 1 | -2/+2 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add Google Cloud client project billing info | Matija Čupić | 2017-12-16 | 2 | -0/+20 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add Google Cloud client project list | Matija Čupić | 2017-12-15 | 2 | -0/+22 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix cluster OAuth feature spec user flow | Matija Čupić | 2017-12-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'master' into ↵ | Matija Čupić | 2017-12-13 | 1113 | -9596/+21674 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled |