summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | Fix LFS uploaded images not being renderedOswaldo Ferreira2018-10-0510-7/+56
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'ee-7126-admin-projects-geo-status' into 'master'Douglas Barbosa Alexandre2018-10-052-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE Backport: enable Geo Status widget in admin/projects See merge request gitlab-org/gitlab-ce!22161
| * | | | | | | | | | | | | | | | Prepare admin/projects/show view to allow EE specific featureGabriel Mazetto2018-10-052-0/+13
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In EE it will render a Geo Status widget when Geo is enabled and it is in a secondary node. Also added minimal specs to that action.
* | | | | | | | | | | | | | | | Merge branch 'autodevops-timed-incremental-rollout' into 'master'Kamil Trzciński2018-10-058-68/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add timed incremental rollout to Auto DevOps Closes gitlab-ee#7545 See merge request gitlab-org/gitlab-ce!22023
| * | | | | | | | | | | | | | | Add timed incremental rollout to Auto DevOpsAlessio Caiazza2018-10-058-68/+162
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto DevOps deployment strategies now supports timed incremental rollout. We are deprecating the usage of INCREMENTAL_ROLLOUT_ENABLED environment variable in Auto DevOps template. The new behavior will be driven by the INCREMENTAL_ROLLOUT_MODE variable that can either be manual (same as INCREMENTAL_ROLLOUT_ENABLED) or timed. Rollout deployments will be executed using a 5 minute delay between each job.
* | | | | | | | | | | | | | | Merge branch 'fix-flacky-test-jobs-spec' into 'master'Kamil Trzciński2018-10-051-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [broken master] Fix time dependent jobs spec See merge request gitlab-org/gitlab-ce!22159
| * | | | | | | | | | | | | | | Fix time dependent jobs specAlessio Caiazza2018-10-051-4/+0
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch ↵Sean McGivern2018-10-054-29/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43109-ci_environments_status-json-executes-more-than-100-queries' into 'master' Resolve "Controller Projects::MergeRequestsController#ci_environments_status.json executes more than 100 SQL queries" Closes #43109 See merge request gitlab-org/gitlab-ce!21996
| * | | | | | | | | | | | | | | | Update spec comment to point to correct issueBrett Walker2018-10-051-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Don't build project services unneccesarilyBrett Walker2018-10-044-29/+52
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'docs/variables-doc' into 'master'Achilleas Pipinellis2018-10-051-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix documentation for variables Closes #51814 See merge request gitlab-org/gitlab-ce!21943
| * | | | | | | | | | | | | | | | Fix documentation for variablesEvan Read2018-10-051-9/+11
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch ↵Achilleas Pipinellis2018-10-051-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '7453_document_security_and_licence_management_features_permissions-docs' into 'master' Document Security and Licence Management features permissions See merge request gitlab-org/gitlab-ce!22042
| * | | | | | | | | | | | | | | Document Security and Licence Management features permissionsGilbert Roulot2018-10-051-1/+8
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqBob Van Landuyt2018-10-0516-39/+194
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'security-bw-confidential-titles-through-markdown-api' into ↵Bob Van Landuyt2018-10-055-5/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [master] Confidential issue/private snippet titles can be read by unauthenticated user through GFM markdown API Closes #2706 See merge request gitlab/gitlabhq!2507
| | * | | | | | | | | | | | | | | post_process markdown redered by APIBrett Walker2018-09-295-5/+62
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'security-fix-leaking-private-project-namespace' into 'master'Bob Van Landuyt2018-10-056-33/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Fix leaking private project namespace Closes #2708 See merge request gitlab/gitlabhq!2529
| | * | | | | | | | | | | | | | | | Filter system notes with public and private cross referencesBrett Walker2018-10-026-33/+80
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'security-osw-user-info-leak-discussions' into 'master'Bob Van Landuyt2018-10-054-1/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [security - master] Filter user sensitive data from discussions JSON See merge request gitlab/gitlabhq!2536
| | * | | | | | | | | | | | | | | | | Add changelogOswaldo Ferreira2018-10-011-0/+5
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Filter user sensitive data from discussions JSONOswaldo Ferreira2018-10-013-1/+29
| | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Update CHANGELOG.md for 11.2.5GitLab Release Tools Bot2018-10-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | Update CHANGELOG.md for 11.1.8GitLab Release Tools Bot2018-10-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | Merge branch ↵Sean McGivern2018-10-054-10/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '50359-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Resolve "ActiveRecord::StatementInvalid: PG::QueryCanceled: ERROR: canceling statement due to statement timeout" Closes #50359 See merge request gitlab-org/gitlab-ce!21893
| * | | | | | | | | | | | | | | | | | Use a CTE to remove the query timeoutBrett Walker2018-10-054-10/+113
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'issue_43097' into 'master'Sean McGivern2018-10-055-58/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move related branches to service Closes #43097 See merge request gitlab-org/gitlab-ce!22094
| * | | | | | | | | | | | | | | | | | | Move issue related_branches to serviceFelipe Artur2018-10-045-58/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the related_branches method from Issue model to RelatedBranchesService
* | | | | | | | | | | | | | | | | | | | Merge branch 'ce-5987-project-templates-api' into 'master'Robert Speicher2018-10-0533-705/+756
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new project-specific templates API endpoint See merge request gitlab-org/gitlab-ce!22118
| * | | | | | | | | | | | | | | | | | | | Backport project template API to CENick Thomas2018-10-0533-705/+756
| | |_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rails5-fix-artifacts-controller-spec' into 'master'Kamil Trzciński2018-10-052-6/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5: fix artifacts controller download spec See merge request gitlab-org/gitlab-ce!22123
| * | | | | | | | | | | | | | | | | | | | Rails5: fix artifacts controller download specJasper Maes2018-10-042-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 has params[:file_type] as '' if file_type is included as nil in the request
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sh-revert-broken-deploy-key-change' into 'master'Robert Speicher2018-10-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'deploy-tokens' into 'master'" Closes #52228 See merge request gitlab-org/gitlab-ce!22149
| * | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'deploy-tokens' into 'master'"Stan Hu2018-10-051-2/+2
| |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3df32ac1290160680473248b48d1b12c96458bf7, reversing changes made to dd1295a30f28eeb3c7058b1899e00db7943f3e54.
* | | | | | | | | | | | | | | | | | | | Merge branch 'scheduled-manual-jobs' into 'master'Kamil Trzciński2018-10-0589-189/+2159
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delayed jobs Closes #51352 See merge request gitlab-org/gitlab-ce!21767
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0594-253/+1445
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Remove unnecessary change in schema.rbShinya Maeda2018-10-051-1/+0
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Change partial index's condition to make stale delayed builds removal a lot ↵Shinya Maeda2018-10-052-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | faster
| * | | | | | | | | | | | | | | | | | | | | Fix pipelines specShinya Maeda2018-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Make sure remaining time of scheduled jobs is positive in pipelines listWinnie Hellmann2018-10-052-7/+27
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add feature spec for remaining timeShinya Maeda2018-10-052-0/+21
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add :js tag for a feature specShinya Maeda2018-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-05231-1224/+3137
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | fix method name in stage specAlessio Caiazza2018-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add component tests for scheduled job frontendWinnie Hellmann2018-10-045-30/+75
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Groomed specsShinya Maeda2018-10-043-18/+21
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Make Ci::Stage status transition event consistent with Ci::PipelineShinya Maeda2018-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add limitation for start_in keywordShinya Maeda2018-10-044-5/+27
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Enable ci_enable_scheduled_build feature flag by defaultShinya Maeda2018-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix spec according to the Ci::Pipeline#delay renameShinya Maeda2018-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | |