summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add AWS ELB note about not supporting web socketsdocs-aws-elb-web-terminalsDrew Blessing2019-05-021-0/+5
|
* Merge branch '28741-play-all-manual-jobs' into 'master'Douglas Barbosa Alexandre2019-05-0228-8/+600
|\ | | | | | | | | | | | | Play all manual jobs in a stage Closes #28741 See merge request gitlab-org/gitlab-ce!27188
| * Adds a way to start multiple manual jobs in stageMayra Cabrera2019-05-0228-8/+600
|/ | | | | | | | | | - Adds an endpoint on PipelinesController - Adds a service that iterates over every build in a stage and plays it. - Includes 'play_manual' details on EntitySerializer - Builds a new Stage state: PlayManual. An stage can take this status if it has manual builds or an skipped, scheduled or manual status - Includes FE modifications and specs
* Merge branch '5966-rebase-with-block' into 'master'Douwe Maan2019-05-029-20/+219
|\ | | | | | | | | | | | | Update rebasing to use the new two-phase Gitaly Rebase RPC Closes gitlab-ee#5966 See merge request gitlab-org/gitlab-ce!27446
| * Add support for two-step Gitaly Rebase RPCLuke Duncalfe2019-05-029-20/+219
|/ | | | | | | | | | | | | | The new two-step Gitaly `Rebase` RPC yields the rebase commit SHA to the client before proceeding with the rebase. This avoids an issue where the rebase commit SHA was returned when the RPC had fully completed, and in some cases this would be after the Rails `post_receive` worker services had already run. In these situations, the merge request did not yet have its rebase_commit_sha attribute set introducing the possibility for bugs (such as previous approvals being reset). https://gitlab.com/gitlab-org/gitlab-ee/issues/5966
* Merge branch '27777-drop-projects-ci_id-column' into 'master'Douglas Barbosa Alexandre2019-05-025-54/+30
|\ | | | | | | | | | | | | Resolve "Drop "projects"."ci_id" column" Closes #27777 See merge request gitlab-org/gitlab-ce!27623
| * Remove unused projects.ci_id column27777-drop-projects-ci_id-columnDmitriy Zaporozhets2019-05-025-54/+30
| | | | | | | | | | | | And remove Gitlab::Ci::Trace#deprecated_path as it relies on ci_id Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'remove-comment-personal-snippet-permission' into 'master'Douwe Maan2019-05-025-37/+44
|\ \ | | | | | | | | | | | | | | | | | | Remove the `comment_personal_snippet` permission Closes #56688 See merge request gitlab-org/gitlab-ce!27999
| * | Remove the `comment_personal_snippet` permissionremove-comment-personal-snippet-permissionSean McGivern2019-05-025-37/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is now entirely handled by `create_note`: 1. Project snippets prevent `create_note`. 2. Uploads already only support routing for personal snippets. This simplifies some policies and access checks, too!
* | | Merge branch 'issue-61038-deploy-chat-message-update' into 'master'Douglas Barbosa Alexandre2019-05-026-8/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Deployment Chat Message Closes #61038 See merge request gitlab-org/gitlab-ce!27972
| * | | Update deployment chat message notificationJason Goodman2019-05-026-8/+31
|/ / / | | | | | | | | | | | | Include link to user and commit title. Rearrange text
* | | Merge branch 'ac-package-storage-stats' into 'master'Andreas Brandl2019-05-0212-30/+96
|\ \ \ | | | | | | | | | | | | | | | | Add packages_size to ProjectStatistics See merge request gitlab-org/gitlab-ce!27373
| * | | Add packages_size to ProjectStatisticsAlessio Caiazza2019-05-0212-30/+96
|/ / / | | | | | | | | | | | | This new field will allow to keep track of the storage used by the packages features, it provides also aggregation at namespace level.
* | | Merge branch '9932-fix-deprecated-attribute_changed-ce' into 'master'Andreas Brandl2019-05-0216-66/+77
|\ \ \ | | | | | | | | | | | | | | | | [CE] Remove deprecated usage of `attribute_changed?` See merge request gitlab-org/gitlab-ce!27577
| * | | Remove deprecated uses of attribute_changed?9932-fix-deprecated-attribute_changed-ceHeinrich Lee Yu2019-04-3016-66/+77
| | | | | | | | | | | | | | | | Prepares us for upgrade to Rails 5.2
* | | | Merge branch '10694-propagate-env-vars-for-gitlab-own-ci-sast-depscan-ce' ↵Douwe Maan2019-05-021-8/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update ENV vars syntax for reports.ci.yml See merge request gitlab-org/gitlab-ce!27771
| * | | | Update ENV vars syntax for reports.ci.ymlVictor Zagorodny2019-05-021-8/+46
|/ / / /
* | | | Merge branch '60777-uninstall-button' into 'master'Phil Hughes2019-05-0219-143/+591
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement UI for uninstalling Cluster’s managed apps Closes #60777 See merge request gitlab-org/gitlab-ce!27559
| * | | | Uninstall application confirm modal componentEnrique Alcántara2019-05-0219-143/+591
|/ / / / | | | | | | | | | | | | | | | | - Vue confirmation modal implementation - CSS tweaks for modal default height
* | | | Merge branch 'js-i18n-diff-notes' into 'master'Phil Hughes2019-05-027-14/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Internationalisation of diff_note directory See merge request gitlab-org/gitlab-ce!27677
| * | | | Internationalisation of diff_note directoryBrandon Labuschagne2019-05-027-14/+50
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | Merge branch 'js-i18n-pages' into 'master'Filipa Lacerda2019-05-026-22/+81
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Internationalisation of pages directory See merge request gitlab-org/gitlab-ce!27731
| * | | | Internationalisation of pages directoryBrandon Labuschagne2019-05-026-22/+81
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | Merge branch 'fix-ide-relative-url-bug' into 'master'Phil Hughes2019-05-023-7/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix IDE get file data with '/' as relative root See merge request gitlab-org/gitlab-ce!27911
| * | | | Fix IDE get file data with '/' as relative rootfix-ide-relative-url-bugPaul Slaughter2019-04-303-7/+24
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/60932
* | | | | Merge branch 'tc-improve-db-process' into 'master'Andreas Brandl2019-05-021-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Escape the usernames to avoid mentions See merge request gitlab-org/gitlab-ce!28004
| * | | | | Escape the usernames to avoid mentionsToon Claes2019-05-021-3/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Avoid people and groups getting mentioned unintentionally by surrounding the names with backticks.
* | | | | Merge branch 'js-i18n-merge-conflict' into 'master'Fatih Acet2019-05-023-8/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of merge_conflicts directory See merge request gitlab-org/gitlab-ce!27720
| * | | | | Internationalisation of merge_conflicts directoryBrandon Labuschagne2019-05-023-8/+37
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | Merge branch 'js-i18n-t-directories' into 'master'Fatih Acet2019-05-023-2/+11
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Internationalisation of javascript/t* directories See merge request gitlab-org/gitlab-ce!27748
| * | | | Internationalisation of javascript/t* directoriesBrandon Labuschagne2019-05-023-2/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | Merge branch ↵Filipa Lacerda2019-05-0214-62/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scss' into 'master' Resolve "Fix the following style-lint errors and warnings for `app/assets/stylesheets/pages/commits.scss`" Closes #59898 See merge request gitlab-org/gitlab-ce!27647
| * | | | Fix commits.scss style-lint errors59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scssScott Hampton2019-04-2514-62/+27
| | | | | | | | | | | | | | | | | | | | Updating class names, and using existing utility classes.
* | | | | Merge branch 'masked-variables-docs-update' into 'master'Filipa Lacerda2019-05-022-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarify masked variable message, add docs link See merge request gitlab-org/gitlab-ce!27156
| * | | | | Clarify masked variable message, add link to docsmasked-variables-docs-updatemfluharty2019-04-182-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update error message "This variable will not be masked" to "Cannot use Masked Variable with current value" Add link to masked variables section to error message
* | | | | | Merge branch ↵Douwe Maan2019-05-028-16/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs' into 'master' Disable retrying cancelled jobs Closes #53064 See merge request gitlab-org/gitlab-ce!27503
| * | | | | | Apply suggestion to doc/ci/pipelines.md53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobsMiranda Fluharty2019-05-011-4/+2
| | | | | | |
| * | | | | | Update documentation to explain job retryabilitymfluharty2019-04-231-0/+5
| | | | | | |
| * | | | | | Update specs that use retryable canceled jobsmfluharty2019-04-195-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specs that test canceled jobs now - expect them not to be retryable or playable - expect them not to show retry buttons Specs that test retryability now - use failed status instead of canceled status
| * | | | | | Make canceled jobs not retryablemfluharty2019-04-182-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See which tests break
* | | | | | | Merge branch 'patch-52' into 'master'Marcia Ramos2019-05-021-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | fix typo See merge request gitlab-org/gitlab-ce!27907
| * | | | | | fix typoMorris-Chen2019-04-301-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jprovazn-graphql-opentracing' into 'master'Bob Van Landuyt2019-05-026-40/+90
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Monitor GraphQL with Opentracing (Jaeger) Closes #48726 See merge request gitlab-org/gitlab-ce!26981
| * | | | | | Add opentracing integration for graphqlJan Provaznik2019-05-026-40/+90
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends existing graphql's tracer with opentracing measurements. Because it also adds Tracing::Graphql class (for opentracing), it also renames Graphql::Tracing class to Graphql::GenericTracing to minimize confusion with similar class names.
* | | | | | Merge branch 'sh-allow-equal-level-in-subgroup-membership' into 'master'James Lopez2019-05-026-5/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a member to have an access level equal to parent group Closes gitlab-ee#11323 See merge request gitlab-org/gitlab-ce!27913
| * | | | | | Allow a member to have an access level equal to parent groupsh-allow-equal-level-in-subgroup-membershipStan Hu2019-04-306-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose you have this configuration: 1. Subgroup `hello/world` 2. Subgroup `hello/mergers`. 3. Project `hello/world/my-project` has invited group `hello/world` to access protected branches. 4. The rule allows the group to merge but no one can push. 5. User `newuser` has Owner access to the parent group `hello`. Previously, there was no way for the user `newuser` to be added to the `hello/mergers` group since the validation only allowed a user to be added at a higher access level. Since membership in a subgroup confers certain access rights, such as being able to merge or push code to protected branches, we have to loosen the validation and allow someone to be added at an equal level granted by the parent group. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11323
* | | | | | | Merge branch 'patch-52' into 'master'Evan Read2019-05-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes a typo in labels.md (Line 45) See merge request gitlab-org/gitlab-ce!27953
| * | | | | | | Removes a typo in labels.md (Line 45)NoaHJ2019-05-011-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'da-sentry-client-side-settings' into 'master'Stan Hu2019-05-016-3/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Sentry client-side DSN to be passed on gitlab.yml See merge request gitlab-org/gitlab-ce!27967
| * | | | | | | | Add CHANGELOG entryda-sentry-client-side-settingsDouglas Barbosa Alexandre2019-05-011-0/+5
| | | | | | | | |