summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Internationalisation of reports directoryBrandon Labuschagne2019-05-032-3/+9
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'ee-10030-excluded-paths' into 'master'Bob Van Landuyt2019-05-032-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass excluded paths to SAST and DS See merge request gitlab-org/gitlab-ce!28018
| * | | | | | | | | | | | | Propagate excluded paths to SAST & DS jobsFabien Catteau2019-05-032-0/+3
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate DS_EXCLUDED_PATHS to dependency_scanning job, and SAST_EXCLUDED_PATHS and SAST_BANDIT_EXCLUDED_PATHS to sast job. This makes possible to excluded certains paths from SAST reports and Dependency Scanning reports, respectively.
* | | | | | | | | | | | | Merge branch 'expand-diff-performance' into 'master'Filipa Lacerda2019-05-0314-97/+379
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Impove the performance of expanding full diff Closes #58597 See merge request gitlab-org/gitlab-ce!27413
| * | | | | | | | | | | | | Impove the performance of expanding full diffPhil Hughes2019-05-0314-97/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58597
* | | | | | | | | | | | | | Merge branch 'docs/sort-ci-features-by-stage' into 'master'Achilleas Pipinellis2019-05-031-20/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort feature set table by stage See merge request gitlab-org/gitlab-ce!27940
| * | | | | | | | | | | | | | Sort feature set table by stageEvan Read2019-05-031-20/+30
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '61365-consider-setting-rspec-full_backtrace-only-in-ci' into ↵Stan Hu2019-05-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Consider setting RSpec `full_backtrace` only in CI" Closes #61365 See merge request gitlab-org/gitlab-ce!28051
| * | | | | | | | | | | | | | Show full Rspec backtrace only in CIHeinrich Lee Yu2019-05-031-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'js-i18n-javascript-s-directories' into 'master'Filipa Lacerda2019-05-034-5/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of javascript/s* directories See merge request gitlab-org/gitlab-ce!27745
| * | | | | | | | | | | | | | | Internationalisation of javascript/s* directoriesBrandon Labuschagne2019-05-034-5/+20
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ↵Phil Hughes2019-05-033-38/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '9971-move-ee-differences-for-app-assets-javascripts-notes-components-note_form-vue-ce' into 'master' EE Backport to CE of EE!11151 See merge request gitlab-org/gitlab-ce!27824
| * | | | | | | | | | | | | | EE Backport to CE of Note Form EE Diffs9971-move-ee-differences-for-app-assets-javascripts-notes-components-note_form-vue-ceSam Bigelow2019-05-023-38/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves all EE Specific lines into the ee directory CE Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11151/commits?view=parallel
* | | | | | | | | | | | | | | Merge branch '18432-switch-to-sassc-rails' into 'master'Stan Hu2019-05-033-10/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to sassc-rails for faster stylesheet compilation Closes #18432 See merge request gitlab-org/gitlab-ce!26224
| * | | | | | | | | | | | | | | Switch to sassc-rails for faster stylesheet compilation18432-switch-to-sassc-railsGabriel Mazetto2019-04-273-10/+16
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'patch-20' into 'master'Evan Read2019-05-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [docs] Clarify gitlab.rb settings for modifying pipeline schedule worker See merge request gitlab-org/gitlab-ce!27725
| * | | | | | | | | | | | | | | | Clarify gitlab.rb settings for modifying pipeline schedule workerZac Sturgess2019-05-021-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'sh-whitelist-internal-api' into 'master'Stan Hu2019-05-032-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitelist query limits for internal API Closes gitlab-ee#11450 See merge request gitlab-org/gitlab-ce!28037
| * | | | | | | | | | | | | | | | | Whitelist query limits for internal APIStan Hu2019-05-032-1/+5
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a merge request for push options, there may be over 100 queries that are run to create a merge request. Even after we reduce the number of queries by disabling the Sidekiq jobs, it appears we still hover near this limit. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11450
* | | | | | | | | | | | | | | | | Merge branch 'docs/modify-versions-guidance' into 'master'Mike Lewis2019-05-031-18/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust how we do version text in docs See merge request gitlab-org/gitlab-ce!22894
| * | | | | | | | | | | | | | | | | Final review feedback applieddocs/modify-versions-guidanceEvan Read2019-05-021-3/+3
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Adjust guidance based on feedbackEvan Read2019-05-021-2/+3
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Change the guidance for version textEvan Read2019-05-021-23/+13
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Adjust how we do version text in docsEvan Read2019-05-021-6/+23
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '56557-disable-kubernetes-namespace-service-account-backend' ↵Stan Hu2019-05-0324-22/+224
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add gitlab-managed option to clusters form Closes #56557 See merge request gitlab-org/gitlab-ce!26565
| * | | | | | | | | | | | | | | | | Add gitlab-managed option to clusters formMayra Cabrera2019-05-0324-22/+224
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this option is enabled, GitLab will create namespaces and service accounts as usual. When disabled, GitLab wont create any project specific kubernetes resources Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56557
* | | | | | | | | | | | | | | | | Merge branch 'docs-jc-document-gitaly-log' into 'master'Evan Read2019-05-021-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document where Gitaly instance writes logs during rspec See merge request gitlab-org/gitlab-ce!28015
| * | | | | | | | | | | | | | | | | Document where Gitaly instance writes logs during rspecJohn Cai2019-05-021-0/+2
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'docs-update-pages-comm-contribution' into 'master'Evan Read2019-05-021-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: update Pages - make user/group website See merge request gitlab-org/gitlab-ce!27903
| * | | | | | | | | | | | | | | | Need to change only the pathdocs-update-pages-comm-contributionMarcia Ramos2019-04-301-3/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Clarify instructions for making user/group siteBrandon Houghton2019-04-171-2/+3
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'use-pg-10.7' into 'master'Stan Hu2019-05-022-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use PostgreSQL 10.7 in tests See merge request gitlab-org/gitlab-ce!28020
| * | | | | | | | | | | | | | | | | Use PostgreSQL 10.7use-pg-10.7Balasankar "Balu" C2019-05-022-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | | | | | | | | | | | | | | | | | Merge branch 'pack-refs' into 'master'Stan Hu2019-05-026-4/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Schedule `git pack-refs` after push Closes #59715 See merge request gitlab-org/gitlab-ce!27826
| * | | | | | | | | | | | | | | | | | Use git_garbage_collect_worker to run pack_refsJan Provaznik2019-05-026-4/+47
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackRefs is not an expensive gitaly call - we want to call it more often (than as part of full `gc`) because it helps to keep number of refs files small - too many refs file may be a problem for deployments with slow storage.
* | | | | | | | | | | | | | | | | | Merge branch 'jc-upgrade-gitaly-1.38.0' into 'master'Stan Hu2019-05-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to 1.40.0 See merge request gitlab-org/gitlab-ce!27968
| * | | | | | | | | | | | | | | | | Upgrade Gitaly to 1.40.0John Cai2019-05-021-1/+1
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes catfile cache, as well as fixes to the catfile cache code that caused it to panic in Gitaly
* | | | | | | | | | | | | | | | | 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