summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '5480-epic-notifications-ce' into 'master'Douwe Maan2018-05-0719-96/+131
|\ | | | | | | | | Backport 5480-epic-notifications from EE See merge request gitlab-org/gitlab-ce!18724
| * Backport 5480-epic-notifications from EEMario de la Ossa2018-05-0719-96/+131
| |
* | Merge branch 'upgrade-to-webpack-v4' into 'master'Clement Ho2018-05-0714-564/+1377
|\ \ | | | | | | | | | | | | | | | | | | Upgrade to Webpack 4 Closes #43400 See merge request gitlab-org/gitlab-ce!17218
| * \ Merge branch 'master' into upgrade-to-webpack-v4Mike Greiling2018-05-07417-5284/+12642
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (252 commits) Upgrade underscore.js Enable prometheus metrics by default Add signature verification badge to compare view Add Changelog Update instalation from source guide fix Web IDE file tree scroll issue Enable quick support actions default Backport of 4084-epics-username-autocomplete Remove top margin on the terms page with performance bar Backports every CE related change from ee-44542 to CE Fix typo in changelog entry fix missing space Backport IdentityLinker#failed? from GroupSaml callback flow Add ci_cd_settings delete_all dependency on project AutoDevOps Docs fix invalid external link Ignore knapsack and rspec_flaky Ensure web hook 'blocked URL' errors are stored in as web hook logs and properly surfaced to the user Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runner pages Reuses `InternalRedirect` when possible Enforces terms in the web application ...
| * | | resolve conflicts with masterMike Greiling2018-05-072-4/+4
| | | |
| * | | remove unused methods until neededMike Greiling2018-05-071-22/+0
| | | |
| * | | add webpack_ prefix to entrypoint paths helperMike Greiling2018-05-071-4/+4
| | | |
| * | | consolidate main bootstrap entriesMike Greiling2018-05-062-9/+9
| | | |
| * | | prettify main.jsMike Greiling2018-05-061-15/+30
| | | |
| * | | remove unused name-all-modules-pluginMike Greiling2018-05-043-6/+0
| | | |
| * | | update webpack to v4.7.0 along with a few dependenciesMike Greiling2018-05-042-60/+115
| | | |
| * | | add better description for resetServiceWorkersPublicPathMike Greiling2018-05-041-1/+4
| | | |
| * | | truncate long chunkhashes within filenamesMike Greiling2018-05-041-6/+6
| | | |
| * | | fix raven specsMike Greiling2018-05-031-1/+1
| | | |
| * | | prevent duplicate chunks from being loaded in webpack_helperMike Greiling2018-05-031-2/+9
| | | |
| * | | remove force_same_domain option from webpack helpersMike Greiling2018-05-031-8/+6
| | | |
| * | | add better filename template to worker-loaderMike Greiling2018-05-031-1/+9
| | | |
| * | | adjust IDE page loading config to ensure web workers are not loaded cross-originMike Greiling2018-05-034-19/+20
| | | |
| * | | ensure parent entrypoint is loaded if direct one is unavailableMike Greiling2018-05-011-5/+11
| | | |
| * | | update several packages to remove deprecation warningsMike Greiling2018-05-013-145/+69
| | | |
| * | | combine ancestor entrypoints into child entrypoints instead of importing ↵Mike Greiling2018-05-012-13/+26
| | | | | | | | | | | | | | | | bundles for each
| * | | update webpack manifest integration to recognize multi-chunk entrypointsMike Greiling2018-05-013-11/+56
| | | |
| * | | move dev server middleware to new namespaceMike Greiling2018-05-012-3/+3
| | | |
| * | | temporarily disable deterministic chunk hash logicMike Greiling2018-05-011-44/+0
| | | |
| * | | adjust webpack configMike Greiling2018-05-012-37/+40
| | | |
| * | | update more dependenciesMike Greiling2018-05-012-70/+59
| | | |
| * | | update webpack webpack-dev-server and other webpack dependenciesMike Greiling2018-05-012-223/+1041
| | | |
* | | | Merge branch 'fix-shortcut-close-screen-with-key' into 'master'Annabel Gray2018-05-072-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix close keyboard shortcuts dialog using the keyboard shortcut See merge request gitlab-org/gitlab-ce!18783
| * | | | Fix close keyboard shortcuts dialog using the keyboard shortcutLars Greiss2018-05-072-0/+6
|/ / / /
* | | | Merge branch '41082-make-deploykeys-table-more-clearly-structured' into 'master'Clement Ho2018-05-0720-518/+766
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make deploy keys table more clearly structured Closes #41082 See merge request gitlab-org/gitlab-ce!18279
| * | | | Make deploy keys table more clearly structuredLukas Eipert2018-05-0720-518/+766
|/ / / /
* | | | Merge branch '43469-gcp-account-offer' into 'master'Clement Ho2018-05-0717-25/+185
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Inform users of up to $500 offer for GCP account" Closes #43469 See merge request gitlab-org/gitlab-ce!18684
| * | | | Resolve "Inform users of up to $500 offer for GCP account"Dennis Tang2018-05-0717-25/+185
|/ / / /
* | | | Merge branch 'docs-fe-guide-notice' into 'master'Tim Zallmann2018-05-071-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notice to current fe guide about new fe guide Closes #46067 See merge request gitlab-org/gitlab-ce!18781
| * | | | Add notice to current fe guide about new fe guideClement Ho2018-05-071-0/+3
| | | | |
* | | | | Merge branch '36983-osw-heading-labels-color-fix' into 'master'Filipa Lacerda2018-05-072-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Issue Boards List Heading Label chooses Wrong Text Color" Closes #36983 See merge request gitlab-org/gitlab-ce!18786
| * | | | | Adjust issue boards list header label text colorOswaldo Ferreira2018-05-072-1/+7
| | | | | |
* | | | | | Merge branch '44833-ide-clean-up-status-bar' into 'master'Phil Hughes2018-05-0714-70/+364
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clean up bottom status bar Web IDE" Closes #44833 See merge request gitlab-org/gitlab-ce!18756
| * | | | | | Resolve "Clean up bottom status bar Web IDE"André Luís2018-05-0714-70/+364
|/ / / / / /
* | | | | | Merge branch '10-8-update-guide' into 'master'Robert Speicher2018-05-071-0/+362
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add update guide for 10.8 See merge request gitlab-org/gitlab-ce!18695
| * | | | | | Add update guide for 10.8Filipa Lacerda2018-05-071-0/+362
|/ / / / / /
* | | | | | Merge branch 'improve-commit-message-body-rendering' into 'master'Filipa Lacerda2018-05-076-25/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved commit message body rendering See merge request gitlab-org/gitlab-ce!18725
| * | | | | | Improved commit message body renderingConstance Okoghenun2018-05-076-25/+21
|/ / / / / /
* | | | | | Merge branch 'ccr/weight_1481' into 'master'Douwe Maan2018-05-075-32/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of 1481-changing-weight-values-should-trigger-system-notes See merge request gitlab-org/gitlab-ce!18699
| * | | | | | Backport of 1481-changing-weight-values-should-trigger-system-notesChantal Rollison2018-05-035-32/+34
| | | | | | |
* | | | | | | Merge branch 'add-git-commit-message-predefined-variable' into 'master'Grzegorz Bizon2018-05-075-6/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI_COMMIT_MESSAGE, CI_COMMIT_TITLE and CI_COMMIT_DESCRIPTION predefined variables Closes #20400 See merge request gitlab-org/gitlab-ce!18672
| * | | | | | | Document new variablesTomasz Maczukin2018-05-071-0/+3
| | | | | | | |
| * | | | | | | Add memoization of commit related values in Ci::PipelineTomasz Maczukin2018-05-071-6/+18
| | | | | | | |
| * | | | | | | Add CHANGELOG entryTomasz Maczukin2018-05-071-0/+5
| | | | | | | |
| * | | | | | | Add a CI_COMMIT_MESSAGE predefined variableTomasz Maczukin2018-05-073-2/+16
| | | | | | | |