Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5480-epic-notifications-ce' into 'master' | Douwe Maan | 2018-05-07 | 19 | -96/+131 |
|\ | | | | | | | | | Backport 5480-epic-notifications from EE See merge request gitlab-org/gitlab-ce!18724 | ||||
| * | Backport 5480-epic-notifications from EE | Mario de la Ossa | 2018-05-07 | 19 | -96/+131 |
| | | |||||
* | | Merge branch 'upgrade-to-webpack-v4' into 'master' | Clement Ho | 2018-05-07 | 14 | -564/+1377 |
|\ \ | | | | | | | | | | | | | | | | | | | Upgrade to Webpack 4 Closes #43400 See merge request gitlab-org/gitlab-ce!17218 | ||||
| * \ | Merge branch 'master' into upgrade-to-webpack-v4 | Mike Greiling | 2018-05-07 | 417 | -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 master | Mike Greiling | 2018-05-07 | 2 | -4/+4 |
| | | | | |||||
| * | | | remove unused methods until needed | Mike Greiling | 2018-05-07 | 1 | -22/+0 |
| | | | | |||||
| * | | | add webpack_ prefix to entrypoint paths helper | Mike Greiling | 2018-05-07 | 1 | -4/+4 |
| | | | | |||||
| * | | | consolidate main bootstrap entries | Mike Greiling | 2018-05-06 | 2 | -9/+9 |
| | | | | |||||
| * | | | prettify main.js | Mike Greiling | 2018-05-06 | 1 | -15/+30 |
| | | | | |||||
| * | | | remove unused name-all-modules-plugin | Mike Greiling | 2018-05-04 | 3 | -6/+0 |
| | | | | |||||
| * | | | update webpack to v4.7.0 along with a few dependencies | Mike Greiling | 2018-05-04 | 2 | -60/+115 |
| | | | | |||||
| * | | | add better description for resetServiceWorkersPublicPath | Mike Greiling | 2018-05-04 | 1 | -1/+4 |
| | | | | |||||
| * | | | truncate long chunkhashes within filenames | Mike Greiling | 2018-05-04 | 1 | -6/+6 |
| | | | | |||||
| * | | | fix raven specs | Mike Greiling | 2018-05-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | prevent duplicate chunks from being loaded in webpack_helper | Mike Greiling | 2018-05-03 | 1 | -2/+9 |
| | | | | |||||
| * | | | remove force_same_domain option from webpack helpers | Mike Greiling | 2018-05-03 | 1 | -8/+6 |
| | | | | |||||
| * | | | add better filename template to worker-loader | Mike Greiling | 2018-05-03 | 1 | -1/+9 |
| | | | | |||||
| * | | | adjust IDE page loading config to ensure web workers are not loaded cross-origin | Mike Greiling | 2018-05-03 | 4 | -19/+20 |
| | | | | |||||
| * | | | ensure parent entrypoint is loaded if direct one is unavailable | Mike Greiling | 2018-05-01 | 1 | -5/+11 |
| | | | | |||||
| * | | | update several packages to remove deprecation warnings | Mike Greiling | 2018-05-01 | 3 | -145/+69 |
| | | | | |||||
| * | | | combine ancestor entrypoints into child entrypoints instead of importing ↵ | Mike Greiling | 2018-05-01 | 2 | -13/+26 |
| | | | | | | | | | | | | | | | | bundles for each | ||||
| * | | | update webpack manifest integration to recognize multi-chunk entrypoints | Mike Greiling | 2018-05-01 | 3 | -11/+56 |
| | | | | |||||
| * | | | move dev server middleware to new namespace | Mike Greiling | 2018-05-01 | 2 | -3/+3 |
| | | | | |||||
| * | | | temporarily disable deterministic chunk hash logic | Mike Greiling | 2018-05-01 | 1 | -44/+0 |
| | | | | |||||
| * | | | adjust webpack config | Mike Greiling | 2018-05-01 | 2 | -37/+40 |
| | | | | |||||
| * | | | update more dependencies | Mike Greiling | 2018-05-01 | 2 | -70/+59 |
| | | | | |||||
| * | | | update webpack webpack-dev-server and other webpack dependencies | Mike Greiling | 2018-05-01 | 2 | -223/+1041 |
| | | | | |||||
* | | | | Merge branch 'fix-shortcut-close-screen-with-key' into 'master' | Annabel Gray | 2018-05-07 | 2 | -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 shortcut | Lars Greiss | 2018-05-07 | 2 | -0/+6 |
|/ / / / | |||||
* | | | | Merge branch '41082-make-deploykeys-table-more-clearly-structured' into 'master' | Clement Ho | 2018-05-07 | 20 | -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 structured | Lukas Eipert | 2018-05-07 | 20 | -518/+766 |
|/ / / / | |||||
* | | | | Merge branch '43469-gcp-account-offer' into 'master' | Clement Ho | 2018-05-07 | 17 | -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 Tang | 2018-05-07 | 17 | -25/+185 |
|/ / / / | |||||
* | | | | Merge branch 'docs-fe-guide-notice' into 'master' | Tim Zallmann | 2018-05-07 | 1 | -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 guide | Clement Ho | 2018-05-07 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Merge branch '36983-osw-heading-labels-color-fix' into 'master' | Filipa Lacerda | 2018-05-07 | 2 | -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 color | Oswaldo Ferreira | 2018-05-07 | 2 | -1/+7 |
| | | | | | | |||||
* | | | | | | Merge branch '44833-ide-clean-up-status-bar' into 'master' | Phil Hughes | 2018-05-07 | 14 | -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ís | 2018-05-07 | 14 | -70/+364 |
|/ / / / / / | |||||
* | | | | | | Merge branch '10-8-update-guide' into 'master' | Robert Speicher | 2018-05-07 | 1 | -0/+362 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add update guide for 10.8 See merge request gitlab-org/gitlab-ce!18695 | ||||
| * | | | | | | Add update guide for 10.8 | Filipa Lacerda | 2018-05-07 | 1 | -0/+362 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'improve-commit-message-body-rendering' into 'master' | Filipa Lacerda | 2018-05-07 | 6 | -25/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved commit message body rendering See merge request gitlab-org/gitlab-ce!18725 | ||||
| * | | | | | | Improved commit message body rendering | Constance Okoghenun | 2018-05-07 | 6 | -25/+21 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'ccr/weight_1481' into 'master' | Douwe Maan | 2018-05-07 | 5 | -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-notes | Chantal Rollison | 2018-05-03 | 5 | -32/+34 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'add-git-commit-message-predefined-variable' into 'master' | Grzegorz Bizon | 2018-05-07 | 5 | -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 variables | Tomasz Maczukin | 2018-05-07 | 1 | -0/+3 |
| | | | | | | | | |||||
| * | | | | | | | Add memoization of commit related values in Ci::Pipeline | Tomasz Maczukin | 2018-05-07 | 1 | -6/+18 |
| | | | | | | | | |||||
| * | | | | | | | Add CHANGELOG entry | Tomasz Maczukin | 2018-05-07 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | Add a CI_COMMIT_MESSAGE predefined variable | Tomasz Maczukin | 2018-05-07 | 3 | -2/+16 |
| | | | | | | | |