summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adds MR ID to changelog entry41851-enable-eslint-codeclimateFilipa Lacerda2018-02-271-1/+1
|
* Enables eslint in codeclimate jobFilipa Lacerda2018-02-272-2/+7
|
* Merge branch 'slash-commands-changes-for-chatops' into 'master'Kamil Trzciński2018-02-2712-24/+81
|\ | | | | | | | | Expose ChatName objects to slash commands See merge request gitlab-org/gitlab-ce!17295
| * Expose ChatName objects to slash commandsslash-commands-changes-for-chatopsYorick Peterse2018-02-2312-24/+81
| | | | | | | | | | | | | | Instead of only exposing a User to slash commands we now also expose the ChatName object that the User object is retrieved from. This is necessary for GitLab Chatops as we need for example the user ID of the chat user.
* | Merge branch 'refactor-pipelines-list' into 'master'Phil Hughes2018-02-276-5/+8
|\ \ | | | | | | | | | | | | Remove commit_pipelines webpack entry point See merge request gitlab-org/gitlab-ce!17379
| * \ Merge branch 'master' into refactor-pipelines-listrefactor-pipelines-listClement Ho2018-02-26125-379/+343
| |\ \
| * | | Remove commit_pipelines webpack entry pointClement Ho2018-02-266-5/+8
| | | |
* | | | Merge branch '43315-gpg-popover' into 'master'Phil Hughes2018-02-273-9/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Verified commits not displaying properly" Closes #43315 See merge request gitlab-org/gitlab-ce!17323
| * | | | Add missing class to parent element and remove extra CSS43315-gpg-popoverFilipa Lacerda2018-02-264-11/+3
| | | | |
| * | | | [ci skip] Merge branch 'master' into 43315-gpg-popoverFilipa Lacerda2018-02-26145-565/+2310
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (39 commits) Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed Add changelog entry Use imported `DropdownUtils` Update CHANGELOG.md for 10.5.2 Respond 404 when repo does not exist Fix deletion attempts on dropped tables Fix specs prevent localStorage.clear from running when it would cause an error Removed webpack tag move webpack bundles we intend to keep below the list of bundles we're refactoring to reduce conflicts Explicitly add uncovered files to troubleMakers Backport custom metrics ce components remove issue_show webpack bundle in favor of pages/projects/issues/show/index.js Revert "Revert "Use Dir.mktmpdir"" Revert "Use Dir.mktmpdir" Use Dir.mktmpdir Refactored webpack bundle tag for deploy keys Change FileUtils.cp to FileUtils.copy Bring back the initial commit Add a button to deploy a runner to a Kubernetes cluster in the settings page ...
| * | | | | Fix gpg popover boxFilipa Lacerda2018-02-233-6/+11
| | | | | |
* | | | | | Merge branch '43275-improve-variables-validation-message' into 'master'Kamil Trzciński2018-02-277-4/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve Variables validation message" Closes #43275 See merge request gitlab-org/gitlab-ce!17135
| * | | | | | Include CI Variable Key in its uniqueness validation error message43275-improve-variables-validation-messageMatija Čupić2018-02-234-4/+10
| | | | | | |
| * | | | | | Add CHANGELOG entryMatija Čupić2018-02-221-0/+5
| | | | | | |
| * | | | | | Skip variables duplicates validator if variable is already a duplicateMatija Čupić2018-02-223-1/+4
| | | | | | |
| * | | | | | Condition associated variable validation in Project and GroupMatija Čupić2018-02-222-2/+3
| | | | | | |
| * | | | | | Do not validate individual Variables when saving Project/GroupMatija Čupić2018-02-222-2/+2
| | | | | | |
* | | | | | | Merge branch '43261-fix-prometheus-installation' into 'master'Kamil Trzciński2018-02-272-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable RBAC on Prometheus values.yml Closes #43621 See merge request gitlab-org/gitlab-ce!17372
| * | | | | | | Change RBAC value to false on Prometheus values.yml43261-fix-prometheus-installationMayra Cabrera2018-02-262-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This will allow to install Prometheus again without a problem Closes #43621
* | | | | | | | Merge branch 'refactor-environments-folder' into 'master'Phil Hughes2018-02-274-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove environments folder webpack entry point See merge request gitlab-org/gitlab-ce!17380
| * \ \ \ \ \ \ \ Merge branch 'master' into refactor-environments-folderrefactor-environments-folderClement Ho2018-02-26125-379/+343
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Remove environments folder webpack entry pointClement Ho2018-02-264-5/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'patch-17' into 'master'Rémy Coutable2018-02-271-3/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONTRIBUTING.md: Use a proper example for the stewardship label Closes #43579 See merge request gitlab-org/gitlab-ce!17347
| * | | | | | | CONTRIBUTING.md: Use a proper example for stewardship labelCarlos Soriano Sánchez2018-02-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug guidelines example of what should be marked with the stewardship label goes against the principles of GitLab as stated in https://about.gitlab.com/stewardship/ since mentions removing a feature from GitLab CE to make it exclusive of GitLab EE. The example should be the opposite, where GitLab Inc. is bringing a feature from GitLab EE to GitLab CE. This commit changes the example to reflect this situation. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43579
* | | | | | | | Merge branch 'sh-fix-issue-43631' into 'master'Stan Hu2018-02-272-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust the API issues move spec to use project ID 0 Closes #43631 See merge request gitlab-org/gitlab-ce!17381
| * | | | | | | | Adjust the API issues move spec to use project ID 0Stan Hu2018-02-262-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #43631
* | | | | | | | | Merge branch '43532-error-on-admin-applications-prometheus-template' into ↵Stan Hu2018-02-265-26/+77
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" -> edit Prometheus Service Template" Closes #43532 See merge request gitlab-org/gitlab-ce!17377
| * | | | | | | | Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" ↵Mayra Cabrera2018-02-265-26/+77
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | -> edit Prometheus Service Template"
* | | | | | | | Merge branch 'dispatcher-switch' into 'master'Jacob Schatz2018-02-2615-196/+91
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor wildcard dispatcher imports See merge request gitlab-org/gitlab-ce!17297
| * | | | | | | | Refactor wildcard dispatcher importsClement Ho2018-02-2615-196/+91
|/ / / / / / / /
* | | | | | | | Merge branch '4536-move-ee-specific-javascripts-files-to' into 'master'Clement Ho2018-02-2699-112/+110
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Move EE-specific JavaScript files to ee/app/assets/javascripts See merge request gitlab-org/gitlab-ce!17272
| * | | | | | | Move EE-specific JavaScript files to ee/app/assets/javascriptsRémy Coutable2018-02-2699-112/+110
|/ / / / / / /
* | | | | | | Merge branch 'refactor/move-board-new-issue-vue-component' into 'master'Filipa Lacerda2018-02-265-41/+61
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Move BoardNewIssue vue component See merge request gitlab-org/gitlab-ce!16947
| * | | | | | Move BoardNewIssue vue componentGeorge Tsiolis2018-02-085-41/+61
| | | | | | |
* | | | | | | Merge branch 'blob-webpack-bundle-remove-tags' into 'master'Clement Ho2018-02-262-4/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove webpack bundle tags for blob See merge request gitlab-org/gitlab-ce!17331
| * | | | | | | Remove webpack bundle tags for blobJacob Schatz2018-02-262-4/+0
|/ / / / / / /
* | | | | | | Merge branch 'feature/migrate-recursive-tree-entries-fetching' into 'master'Robert Speicher2018-02-267-31/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate recursive tree entries fetching to Gitaly See merge request gitlab-org/gitlab-ce!17191
| * | | | | | | Migrate recursive tree entries fetching to GitalyAhmad Sherif2018-02-267-31/+29
| | | | | | | |
* | | | | | | | Merge branch 'jprovazn-subgroup-labels' into 'master'Sean McGivern2018-02-265-36/+116
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to find labels in ancestor groups and better group support in label service See merge request gitlab-org/gitlab-ce!17209
| * | | | | | | | Allow to find labels in ancestor groups and better group support in label ↵Jan Provaznik2018-02-265-36/+116
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | service
* | | | | | | | Merge branch 'issue-edit-shortcut' into 'master'Filipa Lacerda2018-02-263-4/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue edit shortcut not working Closes #43560 See merge request gitlab-org/gitlab-ce!17360
| * | | | | | | | Fixed issue edit shortcut not workingissue-edit-shortcutPhil Hughes2018-02-263-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by the element getting cached on the class before the Vue app has finished rendering. Closes #43560
* | | | | | | | | Merge branch 'kp-ce-port-5013-fix-multiple-assignee-avatar-alignment' into ↵Clement Ho2018-02-261-1/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE: Fix multiple assignees avatar alignment in issues list See merge request gitlab-org/gitlab-ce!17308
| * | | | | | | | | Fix assignee avatar and notes icon alignmentkp-ce-port-5013-fix-multiple-assignee-avatar-alignmentKushal Pandya2018-02-231-1/+11
| | | | | | | | | |
* | | | | | | | | | Merge branch 'suppress-squash-warnings' into 'master'Douwe Maan2018-02-262-1/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress whitespace warnings in squash error messages Closes gitlab-ee#3639 See merge request gitlab-org/gitlab-ce!17317
| * | | | | | | | | | Suppress whitespace warnings in squash error messagessuppress-squash-warningsSean McGivern2018-02-262-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are obscuring the real error, which is confusing for everyone.
* | | | | | | | | | | Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into ↵Douwe Maan2018-02-266-75/+88
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Refactoring of blob link methods in blob_helper" Closes #41255 See merge request gitlab-org/gitlab-ce!16851
| * | | | | | | | | | | refactor methods inline41255-refactoring-of-blob-link-methods-in-blob_helperJames Lopez2018-02-233-8/+8
| | | | | | | | | | | |
| * | | | | | | | | | | inline methodsJames Lopez2018-02-232-25/+9
| | | | | | | | | | | |
| * | | | | | | | | | | fix fork button issueJames Lopez2018-02-231-1/+1
| | | | | | | | | | | |