summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'fl-ipythin-10-3' into 'security-10-3'Phil Hughes2018-01-152-2/+21
* | Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-152-1/+2
* | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-1511-45/+85
* | Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-151-6/+22
* | Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-151-1/+1
* | Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-154-18/+18
* | Merge branch 'label-xss-10-3' into 'security-10-3'Jacob Schatz2018-01-151-1/+1
* | Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-inte...Stan Hu2018-01-151-0/+5
|/
* Merge branch 'gcp-fix' into 'master'10-4-stable-prepare-rc4Kamil Trzciński2018-01-115-18/+32
* Merge branch '10-4-stable-missing-commits' into 10-4-stable-prepare-rc3-with-...Luke Bennett2018-01-1019-219/+297
|\
| * Merge branch 'delay-background-migrations' into 'master'Rémy Coutable2018-01-081-1/+44
| |\
| | * Run background migrations with a minimum intervaldelay-background-migrationsYorick Peterse2018-01-051-1/+44
| * | Merge branch '40549-render-emoj-in-groups-overview' into 'master'Sean McGivern2018-01-083-2/+12
| |\ \
| | * | Rendering of emoji's in Group-OverviewJacopo2017-12-243-2/+12
| * | | Merge branch 'remove-commit-tree' into 'master'Sean McGivern2018-01-081-1/+1
| |\ \ \
| | * | | Remove the Commit#tree methodremove-commit-treeJacob Vosmaer2018-01-041-1/+1
| * | | | Merge branch '38056-remove-unused-option' into 'master'Phil Hughes2018-01-083-4/+0
| |\ \ \ \
| | * | | | Remove unused push_code_to_protected_branches38056-remove-unused-optionLin Jen-Shin2018-01-053-4/+0
| * | | | | Resolve "Add graph value to hover"Mike Greiling2018-01-086-200/+257
| * | | | | Fix slash commands dropdown descriptionMaurizio De Santis2018-01-082-3/+15
| * | | | | disables the shortcut to the issue boards when issues are disabledChristiaan Van den Poel2018-01-084-9/+12
| * | | | | Merge branch '3968-protected-branch-is-not-set-for-default-branch-on-import' ...Douwe Maan2018-01-083-20/+25
| |\ \ \ \ \
| | * | | | | Protected branch is now created for default branch on import3968-protected-branch-is-not-set-for-default-branch-on-importTiago Botelho2018-01-063-20/+25
| | | |/ / / | | |/| | |
* | | | | | Merge branch 'delay-background-migrations' into 'master'Rémy Coutable2018-01-101-1/+44
* | | | | | Merge branch '3968-protected-branch-is-not-set-for-default-branch-on-import' ...Douwe Maan2018-01-103-20/+25
* | | | | | Merge branch 'changes-dropdown-ellipsis' into 'master'Sean McGivern2018-01-103-4/+10
|/ / / / /
* | | | | Merge branch '39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but...Kamil Trzciński2018-01-076-7/+94
|\ \ \ \ \
| * | | | | 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-072-10/+21
| * | | | | Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-...Matija Čupić2018-01-0630-168/+230
| |\ \ \ \ \
| * | | | | | Store OAuth token in Redis for worker to pick upMatija Čupić2018-01-061-1/+6
| * | | | | | Use token from redis in gcp project billing workerMatija Čupić2018-01-061-1/+14
| * | | | | | Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-...Matija Čupić2018-01-0555-183/+635
| |\ \ \ \ \ \
| * | | | | | | 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-052-3/+3
| * | | | | | | Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-...Matija Čupić2018-01-05182-858/+2222
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| * | | | | | | | Add CheckGcpProjectBilling worker to all_queuesMatija Čupić2017-12-211-0/+1
| * | | | | | | | Implement GCP billing check in cluster formMatija Čupić2017-12-211-7/+21
| * | | | | | | | Remove actions for async GCP project billing checkMatija Čupić2017-12-211-31/+0
| * | | | | | | | Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-...Matija Čupić2017-12-21311-2971/+4604
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add Worker rerun action to GcpControllerMatija Čupić2017-12-161-1/+10
| * | | | | | | | | Handle html format in addition to jsonMatija Čupić2017-12-161-0/+2
| * | | | | | | | | Expand controller test suite matrixMatija Čupić2017-12-162-3/+4
| * | | | | | | | | Use 1 minute for status polling intervalMatija Čupić2017-12-161-1/+1
| * | | | | | | | | Add lease to CheckGcpProjectBillingWorkerMatija Čupić2017-12-161-0/+11