summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix eslint46381-dropdown-mr-widget-backportFilipa Lacerda2018-05-181-1/+1
|
* Add missing docsFilipa Lacerda2018-05-181-0/+7
|
* Backport of Resolve "Dropdown actions in mini pipeline graph in mr widget ↵Filipa Lacerda2018-05-1810-71/+84
| | | | don't work"
* Revert "Merge branch 'osw-fix-boards-list-header-color' into 'master'"10-8-stable-revertFilipa Lacerda2018-05-172-3/+2
| | | | This reverts commit 0e8f3d8e71c5a0306187176995d4f25515b563f8.
* Revert "Merge branch '46303_copy_button_fix_embedded_snippets' into 'master'"Filipa Lacerda2018-05-172-3/+2
| | | | This reverts commit f1818e578259e28b44a575ca0d6297d67e53777e.
* Merge branch '46303_copy_button_fix_embedded_snippets' into 'master'Clement Ho2018-05-172-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 Speicher2018-05-172-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 Thomas2018-05-141-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 Maan2018-05-111-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 Lopez2018-05-111-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ński2018-05-111-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 Lacerda2018-05-112-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 Zallmann2018-05-112-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 Hu2018-05-101-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 Zallmann2018-05-101-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 Maan2018-05-101-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 Lacerda2018-05-092-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 Bizon2018-05-091-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 Speicher2018-05-091-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 Lacerda2018-05-091-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 Bizon2018-05-091-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 Bizon2018-05-083-7/+16
|\ | | | | | | | | Fix failed jobs tab See merge request gitlab-org/gitlab-ce!18520
| * Respect permissions when showing Failed JobsKamil Trzciński2018-05-063-7/+16
| |
* | Backport: Keep ShaAttribute from halting startup when we can’t connect to ↵Brett Walker2018-05-081-7/+22
| | | | | | | | a database
* | Merge branch 'dm-project-factory-import-state' into 'master'Robert Speicher2018-05-071-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 fieldDouwe Maan2018-05-071-18/+18
| | |
* | | Merge branch '43557-osw-present-merge-sha-commit' into 'master'Robert Speicher2018-05-074-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 mergeOswaldo Ferreira2018-05-074-0/+27
| | | |
* | | | Resolve "Monitoring graphs - Popover value improvements"Jose Ivan Vargas2018-05-078-30/+92
| | | |
* | | | Merge branch '5480-epic-notifications-ce' into 'master'Douwe Maan2018-05-077-26/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport 5480-epic-notifications from EE See merge request gitlab-org/gitlab-ce!18724
| * | | | Backport 5480-epic-notifications from EEMario de la Ossa2018-05-077-26/+57
| | |/ / | |/| |
* | | | Merge branch 'upgrade-to-webpack-v4' into 'master'Clement Ho2018-05-076-54/+85
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to Webpack 4 Closes #43400 See merge request gitlab-org/gitlab-ce!17218
| * \ \ \ Merge branch 'master' into upgrade-to-webpack-v4Mike Greiling2018-05-07181-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 helperMike Greiling2018-05-071-4/+4
| | | | | |
| * | | | | consolidate main bootstrap entriesMike Greiling2018-05-061-8/+8
| | | | | |
| * | | | | prettify main.jsMike Greiling2018-05-061-15/+30
| | | | | |
| * | | | | add better description for resetServiceWorkersPublicPathMike Greiling2018-05-041-1/+4
| | | | | |
| * | | | | 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
| | | | | |
| * | | | | adjust IDE page loading config to ensure web workers are not loaded cross-originMike Greiling2018-05-033-9/+18
| | | | | |
| * | | | | ensure parent entrypoint is loaded if direct one is unavailableMike Greiling2018-05-011-5/+11
| | | | | |
| * | | | | combine ancestor entrypoints into child entrypoints instead of importing ↵Mike Greiling2018-05-011-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | bundles for each
| * | | | | update webpack manifest integration to recognize multi-chunk entrypointsMike Greiling2018-05-012-11/+7
| | | | | |
* | | | | | Fix close keyboard shortcuts dialog using the keyboard shortcutLars Greiss2018-05-071-0/+1
| | | | | |
* | | | | | Make deploy keys table more clearly structuredLukas Eipert2018-05-0711-361/+557
| | | | | |
* | | | | | Resolve "Inform users of up to $500 offer for GCP account"Dennis Tang2018-05-0713-21/+136
| | | | | |
* | | | | | Merge branch '36983-osw-heading-labels-color-fix' into 'master'Filipa Lacerda2018-05-071-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 colorOswaldo Ferreira2018-05-071-1/+2
| | |_|_|/ / | |/| | | |
* | | | | | Resolve "Clean up bottom status bar Web IDE"André Luís2018-05-079-70/+183
| | | | | |
* | | | | | Improved commit message body renderingConstance Okoghenun2018-05-075-25/+16
| | | | | |