summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Andreas Kämmerle2018-07-032802-21855/+47711
|\ | | | | | | | | | | | | update-template-name-via-sentence-case # Conflicts: # .gitlab/issue_templates/Feature proposal.md
| * Merge branch 'docs/run-review-only-for-gitlab-org-repos' into 'master'Rémy Coutable2018-07-031-1/+4
| |\ | | | | | | | | | | | | Run the review-docs jobs for gitlab-org repos only See merge request gitlab-org/gitlab-ce!20327
| | * Run the review-docs jobs for gitlab-org repos onlyAchilleas Pipinellis2018-07-031-1/+4
| | |
| * | Merge branch 'update-template-name-via-sentence-case-research' into 'master'🚄 Job van der Voort 🚀2018-07-031-0/+0
| |\ \ | | | | | | | | | | | | | | | | Update template name via sentence case (research) See merge request gitlab-org/gitlab-ce!19327
| | * | Update template name via sentence caseupdate-template-name-via-sentence-case-researchAndreas Kämmerle2018-06-011-0/+0
| | | |
| * | | Merge branch 'update-template-name-via-sentence-case-secutiry' into 'master'🚄 Job van der Voort 🚀2018-07-031-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Update template name via sentence case (security) See merge request gitlab-org/gitlab-ce!19328
| | * | | Update template name via sentence case (security)update-template-name-via-sentence-case-secutiryAndreas Kämmerle2018-06-011-0/+1
| | |/ /
| * | | Merge branch 'update-template-name-via-sentence-case-db-changes' into 'master'🚄 Job van der Voort 🚀2018-07-031-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Update template name via sentence case (database changes) See merge request gitlab-org/gitlab-ce!19329
| | * | | Update template name via sentence case (database changes)update-template-name-via-sentence-case-db-changesAndreas Kämmerle2018-06-011-2/+2
| | |/ /
| * | | Merge branch '46963-add_readme_button_for_non_empty_project' into 'master'Nick Thomas2018-07-033-3/+67
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add readme button to non-empty project page Closes #46963 See merge request gitlab-org/gitlab-ce!20104
| | * | | Add readme button to non-empty project pageImre Farkas2018-07-033-3/+67
| |/ / /
| * | | Merge branch 'temporarily-remove-mr-diffs-migration' into 'master'Alessio Caiazza2018-07-033-119/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Temporarily remove MR diffs removal migration See merge request gitlab-org/gitlab-ce!20330
| | * | | Temporarily remove MR diffs removal migrationSean McGivern2018-07-033-119/+1
| | | | | | | | | | | | | | | | | | | | We will re-add this with a more efficient bulk scheduling method.
| * | | | Merge branch 'sh-backport-repository-partial-index' into 'master'Nick Thomas2018-07-032-1/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport partial index to find repositories that have not been checked See merge request gitlab-org/gitlab-ce!20319
| | * | | | Backport partial index to find repositories that have not been checkedStan Hu2018-07-022-1/+20
| | | |_|/ | | |/| | | | | | | | | | | | This was introduced in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5984.
| * | | | Merge branch '36907-fix-new-issue-link-from-failed-job' into 'master'Grzegorz Bizon2018-07-033-2/+7
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Resolve "New issue from failed build no longer links to failed build" Closes #36907 See merge request gitlab-org/gitlab-ce!20328
| | * | | Fix link to job when creating a new issue from a failed jobRémy Coutable2018-07-033-2/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Merge branch 'docs/bamboo' into 'master'Marcia Ramos2018-07-031-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Copyedit Bamboo integration docs See merge request gitlab-org/gitlab-ce!20312
| | * | | | Copyedit Bamboo integration docsAchilleas Pipinellis2018-07-021-1/+5
| | | | | |
| * | | | | Merge branch 'sh-fix-bamboo-change-set' into 'master'Rémy Coutable2018-07-033-12/+37
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Bamboo CI status not showing for branch plans Closes #1355 See merge request gitlab-org/gitlab-ce!20277
| | * | | | | Fix Bamboo CI status not showing for branch plansStan Hu2018-06-293-12/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original API that queries by label (`/rest/api/latest/result?label=#{sha1}`) only works for results from main plans and not branch plans. The `/rest/api/latest/result/byChangeset/#{sha1}` endpoint gives results from branch plans but not for the first push to the branch. Subsequent pushes work. For more details, see https://jira.atlassian.com/browse/BAM-16121. Closes #1355
| * | | | | | Merge branch 'gitaly-mandatory-20180702-jv' into 'master'Douwe Maan2018-07-039-596/+162
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make OperationService RPC's mandatory Closes gitaly#801, gitaly#779, gitaly#755, gitaly#754, gitaly#727, gitaly#680, gitaly#633, gitaly#547, gitaly#546, and gitaly#541 See merge request gitlab-org/gitlab-ce!20309
| | * | | | | | Make OperationService RPC's mandatoryJacob Vosmaer (GitLab)2018-07-039-596/+162
| |/ / / / / /
| * | | | | | Merge branch 'fix-gitaly-mr-creation-limits' into 'master'Douwe Maan2018-07-034-3/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR diffs created with gitaly_diff_between enabled Closes gitaly#1256 See merge request gitlab-org/gitlab-ce!20300
| | * | | | | | Fix MR diffs created with gitaly_diff_between enabledSean McGivern2018-06-294-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we save merge request diffs to the database, we need to expand the diff before doing so. That's so that we can expand diffs (within the normal limits) without hitting the repository, but just by going to the database. This is done implicitly - diffs are expanded unless we say otherwise. However, we have another option we can pass, that lets us enforce diff size limits, that defaults to true. Prior to this commit: - The Rugged code path defaulted to setting `expanded: true` and `enforce_limits: true`. - The Gitaly code path defaulted to setting `expanded: false` and `enforce_limits: true`. This was introduced by eb36fa17a6ae5cda8950904b5a52e6aa365ae591, which implemented the initial feature. Since then, if the `gitaly_diff_between` feature flag was enabled, MRs would have diffs that could not be expanded in some cases, with no fix other than to disable the feature flag and force push to the MR to refresh the diff in the database.
| * | | | | | | Merge branch 'docs-products-links' into 'master'Achilleas Pipinellis2018-07-0323-28/+28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated /products links to /pricing See merge request gitlab-org/gitlab-ce!20321
| | * | | | | | | Updated products links to pricingMarcel Amirault2018-07-0323-28/+28
| | | | | | | | |
| * | | | | | | | Merge branch 'prune-web-hook-logs' into 'master'Douwe Maan2018-07-036-6/+68
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prune web hook logs older than one month Closes #46120 See merge request gitlab-org/gitlab-ce!20183
| | * | | | | | | Prune web hook logs older than 90 daysYorick Peterse2018-07-026-6/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a recurring Sidekiq job that removes up to 50 000 old web hook logs per hour, if they are older than 90 days. This will prevent the web_hook_logs table from growing indefinitely. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/46120
| * | | | | | | | Merge branch 'sh-remove-aws-initializer' into 'master'Sean McGivern2018-07-032-53/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CarrierWave initializer See merge request gitlab-org/gitlab-ce!20273
| | * | | | | | | | Remove CarrierWave initializerStan Hu2018-06-292-53/+0
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is stale and no longer used. Object storage is now configured in each specific gitlab.yml section (e.g. uploads, lfs, etc.). Part of gitlab-org/omnibus-gitlab#3641
| * | | | | | | | Merge branch 'jprovazn-extra-line' into 'master'Sean McGivern2018-07-033-1/+21
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't add bottom 'match' line for deleted files Closes #48160 See merge request gitlab-org/gitlab-ce!20255
| | * | | | | | | Don't add bottom 'match' line for deleted filesJan Provaznik2018-06-283-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file is deleted, its new_pos is 0 (less than total_blob_lines), but there is no reason to add the bottom 'match' line in this case because there is not extra content which could be expanded.
| * | | | | | | | Merge branch ↵Fatih Acet2018-07-022-3/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '6224-extract-ee-specific-files-lines-for-app-views-shared-boards-components' into 'master' Resolve "Extract EE specific files/lines for app/views/shared/boards/components" Closes gitlab-ee#6224 See merge request gitlab-org/gitlab-ce!20292
| | * | | | | | | | Resolve "Extract EE specific files/lines for app/views/shared/boards/components"Constance Okoghenun2018-07-022-3/+6
| |/ / / / / / / /
| * | | | | | | | Merge branch 'update-left-side-nav-border' into 'master'Annabel Gray2018-07-021-9/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update left side nav border UI Closes #46222 See merge request gitlab-org/gitlab-ce!19967
| | * | | | | | | | Update left side nav border UIAndreas Kämmerle2018-07-021-9/+8
| |/ / / / / / / /
| * | | | | | | | Merge branch 'add-title-placeholder-for-new-issues' into 'master'Annabel Gray2018-07-023-1/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add title placeholder for new issues Closes #48085 See merge request gitlab-org/gitlab-ce!20271
| | * | | | | | | | Update create issue test to check for input placeholdersGeorge Tsiolis2018-06-291-0/+3
| | | | | | | | | |
| | * | | | | | | | Add title placeholder for new issuesGeorge Tsiolis2018-06-292-1/+6
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'fix-last-commit-author-link-is-blue' into 'master'Annabel Gray2018-07-022-5/+14
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed last commit author link is blue regression Closes #48251 See merge request gitlab-org/gitlab-ce!20234
| | * | | | | | | | Fixed last commit author link is blue regressionConstance Okoghenun2018-07-022-5/+14
| |/ / / / / / / /
| * | | | | | | | Merge branch 'docs/job-traces' into 'master'Marcia Ramos2018-07-021-64/+91
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change path to CI job traces Closes #47173 See merge request gitlab-org/gitlab-ce!19422
| | * | | | | | | | Update job_traces.mdMike Lewis2018-06-301-4/+3
| | | | | | | | | |
| | * | | | | | | | Refactor the job traces admin docsdocs/job-tracesAchilleas Pipinellis2018-06-253-89/+90
| | | | | | | | | |
| | * | | | | | | | Fix trace documentationShinya Maeda2018-06-251-14/+44
| | | | | | | | | |
| | * | | | | | | | Change path to CI job tracesAchilleas Pipinellis2018-06-253-6/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch 'docs/ad-typo' into 'master'Marcia Ramos2018-07-021-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update index.md changed "gonna" to "going to be" See merge request gitlab-org/gitlab-ce!20310
| | * | | | | | | | Update index.md changed "gonna" to "going to be"joe d2018-07-021-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'crose-details-on-buildkey' into 'master'Achilleas Pipinellis2018-07-021-2/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add detail around 'Build Key' within the GitLab steps. See merge request gitlab-org/gitlab-ce!20219
View Lorry Controller Status