Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix eslint46381-dropdown-mr-widget-backport | Filipa Lacerda | 2018-05-18 | 1 | -1/+1 |
| | |||||
* | Add missing docs | Filipa Lacerda | 2018-05-18 | 1 | -0/+7 |
| | |||||
* | Backport of Resolve "Dropdown actions in mini pipeline graph in mr widget ↵ | Filipa Lacerda | 2018-05-18 | 10 | -71/+84 |
| | | | | don't work" | ||||
* | Revert "Merge branch 'osw-fix-boards-list-header-color' into 'master'"10-8-stable-revert | Filipa Lacerda | 2018-05-17 | 2 | -3/+2 |
| | | | | This reverts commit 0e8f3d8e71c5a0306187176995d4f25515b563f8. | ||||
* | Revert "Merge branch '46303_copy_button_fix_embedded_snippets' into 'master'" | Filipa Lacerda | 2018-05-17 | 2 | -3/+2 |
| | | | | This reverts commit f1818e578259e28b44a575ca0d6297d67e53777e. | ||||
* | Merge branch '46303_copy_button_fix_embedded_snippets' into 'master' | Clement Ho | 2018-05-17 | 2 | -2/+3 |
| | | | | | | | fixed copy to cliboard button in embedded snippets Closes #46303 See merge request gitlab-org/gitlab-ce!18923 | ||||
* | Merge branch 'osw-fix-boards-list-header-color' into 'master' | Robert Speicher | 2018-05-17 | 2 | -2/+3 |
| | | | | | | | Adjust board lists header text color Closes #36983 See merge request gitlab-org/gitlab-ce!18955 | ||||
* | Merge branch 'bvl-fix-sign-out-on-terms' into 'master' | Nick Thomas | 2018-05-14 | 1 | -2/+7 |
| | | | | | | | Allow a user to sign out when on the terms page Closes #46211 See merge request gitlab-org/gitlab-ce!18875 | ||||
* | Merge branch 'bvl-terms-redirect-loop' into 'master' | Douwe Maan | 2018-05-11 | 1 | -0/+4 |
| | | | | | | | Enforce terms acceptance before configuring 2FA Closes #46256 See merge request gitlab-org/gitlab-ce!18896 | ||||
* | Merge branch '10-8-stable-prepare-rc8-fix-conflict-for-18874' into ↵ | James Lopez | 2018-05-11 | 1 | -1/+7 |
|\ | | | | | | | | | | | | | '10-8-stable-prepare-rc8' Fixes conflict when picking into prep branch See merge request gitlab-org/gitlab-ce!18900 | ||||
| * | Merge branch 'correct-runner-type-when-assigning-shared-to-project' into ↵ | Kamil Trzciński | 2018-05-11 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | 'master' Ensure runner_type is updated correctly when assigning shared runner to project See merge request gitlab-org/gitlab-ce!18874 | ||||
* | | Merge branch 'ide-mr-open-file-fix' into 'master' | Filipa Lacerda | 2018-05-11 | 2 | -1/+2 |
|/ | | | | | Fixed none merge request files not being openable in the web IDE See merge request gitlab-org/gitlab-ce!18881 | ||||
* | Merge branch '46210-terms-acceptance-dropdown-menu' into 'master' | Tim Zallmann | 2018-05-11 | 2 | -4/+9 |
| | | | | | | | Resolve "Terms acceptance dropdown menu" Closes #46210 See merge request gitlab-org/gitlab-ce!18862 | ||||
* | Merge branch 'bw-fix-sha-attribute' into 'master' | Stan Hu | 2018-05-10 | 1 | -1/+2 |
| | | | | | ShaAttribute crashes with ArgumentError if column doesn't exist See merge request gitlab-org/gitlab-ce!18880 | ||||
* | Merge branch 'jr-46209-web-ide-copy' into 'master' | Tim Zallmann | 2018-05-10 | 1 | -2/+2 |
| | | | | | Fix outdated web ide copy See merge request gitlab-org/gitlab-ce!18861 | ||||
* | Merge branch '46147-remove-model-redefinition-worker' into 'master' | Douwe Maan | 2018-05-10 | 1 | -79/+0 |
| | | | | | | | Resolve "NoMethodError: undefined method `uploader_context' for #<ObjectStorage::MigrateUploadsWorker::Upload:0x00007f59e..." Closes #46147 See merge request gitlab-org/gitlab-ce!18820 | ||||
* | Merge branch 'fix-ide-empty-editor' into 'master' | Filipa Lacerda | 2018-05-09 | 2 | -3/+5 |
| | | | | | | | Fixed empty editors in the IDE Closes #46153 See merge request gitlab-org/gitlab-ce!18842 | ||||
* | Merge branch 'add-runner-type-to-cluster-app' into 'master' | Grzegorz Bizon | 2018-05-09 | 1 | -1/+9 |
| | | | | | Set `runner_type` for cluster/application See merge request gitlab-org/gitlab-ce!18832 | ||||
* | Merge branch 'fix_plural_handling_for_migration_to_ghost_user' into 'master' | Robert Speicher | 2018-05-09 | 1 | -2/+2 |
| | | | | | Cleanly handle plural name for ghost user migration See merge request gitlab-org/gitlab-ce!18798 | ||||
* | Merge branch 'ide-mr-icon-fixes' into 'master' | Filipa Lacerda | 2018-05-09 | 1 | -2/+2 |
| | | | | | | | Fixed tooltip & spacing of merge request icon in IDE Closes #46121 and #46123 See merge request gitlab-org/gitlab-ce!18805 | ||||
* | Merge branch 'dm-ensure-import-state-persisted' into 'master' | Grzegorz Bizon | 2018-05-09 | 1 | -2/+8 |
| | | | | | Don't create import_state until project is persisted See merge request gitlab-org/gitlab-ce!18803 | ||||
* | Merge branch 'fix-failed-jobs-tab' into 'master' | Grzegorz Bizon | 2018-05-08 | 3 | -7/+16 |
|\ | | | | | | | | | Fix failed jobs tab See merge request gitlab-org/gitlab-ce!18520 | ||||
| * | Respect permissions when showing Failed Jobs | Kamil Trzciński | 2018-05-06 | 3 | -7/+16 |
| | | |||||
* | | Backport: Keep ShaAttribute from halting startup when we can’t connect to ↵ | Brett Walker | 2018-05-08 | 1 | -7/+22 |
| | | | | | | | | a database | ||||
* | | Merge branch 'dm-project-factory-import-state' into 'master' | Robert Speicher | 2018-05-07 | 1 | -18/+18 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix project factory `import_*` traits Closes gitlab-ee#5904 See merge request gitlab-org/gitlab-ce!18780 | ||||
| * | | Force creation of new import_state when setting an import state field | Douwe Maan | 2018-05-07 | 1 | -18/+18 |
| | | | |||||
* | | | Merge branch '43557-osw-present-merge-sha-commit' into 'master' | Robert Speicher | 2018-05-07 | 4 | -0/+27 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Display merge commit SHA in merge widget after merge" Closes #43557 See merge request gitlab-org/gitlab-ce!18722 | ||||
| * | | | Display merge commit SHA in merge widget after merge | Oswaldo Ferreira | 2018-05-07 | 4 | -0/+27 |
| | | | | |||||
* | | | | Resolve "Monitoring graphs - Popover value improvements" | Jose Ivan Vargas | 2018-05-07 | 8 | -30/+92 |
| | | | | |||||
* | | | | Merge branch '5480-epic-notifications-ce' into 'master' | Douwe Maan | 2018-05-07 | 7 | -26/+57 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -26/+57 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'upgrade-to-webpack-v4' into 'master' | Clement Ho | 2018-05-07 | 6 | -54/+85 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 181 | -3704/+7795 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ... | ||||
| * | | | | | add webpack_ prefix to entrypoint paths helper | Mike Greiling | 2018-05-07 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | consolidate main bootstrap entries | Mike Greiling | 2018-05-06 | 1 | -8/+8 |
| | | | | | | |||||
| * | | | | | prettify main.js | Mike Greiling | 2018-05-06 | 1 | -15/+30 |
| | | | | | | |||||
| * | | | | | add better description for resetServiceWorkersPublicPath | Mike Greiling | 2018-05-04 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | 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 |
| | | | | | | |||||
| * | | | | | adjust IDE page loading config to ensure web workers are not loaded cross-origin | Mike Greiling | 2018-05-03 | 3 | -9/+18 |
| | | | | | | |||||
| * | | | | | ensure parent entrypoint is loaded if direct one is unavailable | Mike Greiling | 2018-05-01 | 1 | -5/+11 |
| | | | | | | |||||
| * | | | | | combine ancestor entrypoints into child entrypoints instead of importing ↵ | Mike Greiling | 2018-05-01 | 1 | -11/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | bundles for each | ||||
| * | | | | | update webpack manifest integration to recognize multi-chunk entrypoints | Mike Greiling | 2018-05-01 | 2 | -11/+7 |
| | | | | | | |||||
* | | | | | | Fix close keyboard shortcuts dialog using the keyboard shortcut | Lars Greiss | 2018-05-07 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Make deploy keys table more clearly structured | Lukas Eipert | 2018-05-07 | 11 | -361/+557 |
| | | | | | | |||||
* | | | | | | Resolve "Inform users of up to $500 offer for GCP account" | Dennis Tang | 2018-05-07 | 13 | -21/+136 |
| | | | | | | |||||
* | | | | | | Merge branch '36983-osw-heading-labels-color-fix' into 'master' | Filipa Lacerda | 2018-05-07 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+2 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Resolve "Clean up bottom status bar Web IDE" | André Luís | 2018-05-07 | 9 | -70/+183 |
| | | | | | | |||||
* | | | | | | Improved commit message body rendering | Constance Okoghenun | 2018-05-07 | 5 | -25/+16 |
| | | | | | |