summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Added admin:conversational_development_index:show import to dispatcherph-dispatcher-1Phil Hughes2018-01-092-1/+4
|
* Added import:fogbugz:new_user_map import to dispatcherPhil Hughes2018-01-092-1/+4
|
* Added ci:lints import to dispatcherPhil Hughes2018-01-093-2/+4
|
* Added import for snippets:show in dispatcherPhil Hughes2018-01-092-4/+13
| | | | #41341
* Refactor dashboard todos inside dispatcherClement Ho2018-01-083-6/+9
|
* Merge branch 'fix/dashboard-projects-nav-links-height' into 'master'Filipa Lacerda2018-01-081-1/+1
|\ | | | | | | | | Fix dashboard projects nav links height See merge request gitlab-org/gitlab-ce!16204
| * Fix dashboard projects nav links heightGeorge Tsiolis2018-01-031-1/+1
| |
* | Merge branch 'fix/remove-unnecessary-dashboard-scroll' into 'master'Annabel Dunstone Gray2018-01-081-4/+0
|\ \ | | | | | | | | | | | | Remove unnecessary dashboard scroll See merge request gitlab-org/gitlab-ce!16213
| * | Remove unnecessary dashboard scrollGeorge Tsiolis2018-01-041-4/+0
| | |
* | | Merge branch '41744-substitute-ui-charcoal-with-ui-indigo' into 'master'Annabel Dunstone Gray2018-01-082-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Substitute ui_charcoal theme deprecated by GitLab Theme (10.0) with ui_indigo Closes #41744 See merge request gitlab-org/gitlab-ce!16271
| * | | Substitute deprecated ui_charcoal with new default ui_indigoTakuya Noguchi2018-01-072-2/+2
| | | |
* | | | Merge branch '28260-fix-pages-custom-domain-url' into 'master'Grzegorz Bizon2018-01-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix wrong output protocol pattern when adding custom domain to Pages" Closes #28260 See merge request gitlab-org/gitlab-ce!16279
| * | | | Generate HTTP URLs for custom Pages domains when appropriateNick Thomas2018-01-081-1/+1
| | | | |
* | | | | Merge branch 'delay-background-migrations' into 'master'Rémy Coutable2018-01-081-1/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '40549-render-emoj-in-groups-overview' into 'master'Sean McGivern2018-01-083-2/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-243-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows rendering of emoji's in the Group Overview.
* | | | | | | Merge branch 'remove-commit-tree' into 'master'Sean McGivern2018-01-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the Commit#tree method See merge request gitlab-org/gitlab-ce!16236
| * | | | | | | 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_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
| | | | | | | | |
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-063-20/+25
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch ↵Kamil Trzciński2018-01-076-7/+94
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | | | | 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 ↵Matija Čupić2018-01-0630-168/+230
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | 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-061-1/+6
| | | | | | | | |
| * | | | | | | | Use token from redis in gcp project billing workerMatija Čupić2018-01-061-1/+14
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into ↵Matija Čupić2018-01-0555-183/+635
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-052-3/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into ↵Matija Čupić2018-01-05182-858/+2222
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | |
| * | | | | | | | | | 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 ↵Matija Čupić2017-12-21311-2971/+4604
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | | | | | | | | | | 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
| | | | | | | | | | | |
View Lorry Controller Status