summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Dry up specmk-10-5-rc8-fix-no-untracked-upload-files-errorMichael Kozono2018-02-151-107/+29
|
* Add changelog entryMichael Kozono2018-02-151-0/+5
|
* Schedule PopulateUntrackedUploads if neededMichael Kozono2018-02-152-1/+48
| | | | | | To finish migrating untracked files to uploads for installations that were affected by https://gitlab.com/gitlab-org/gitlab-ce/issues/42881 Or just to delete the temp table if it is empty and left behind.
* Fix orphan temp table untracked_files_for_uploadsMichael Kozono2018-02-152-26/+27
|
* Fix last batch size equals max batch size errorMichael Kozono2018-02-152-1/+25
|
* Merge branch '43231-document-the-instance-level-auto-devops-domain-option' ↵Achilleas Pipinellis2018-02-151-1/+3
| | | | | | | | | into 'master' Resolve "Document the instance level Auto DevOps domain option" Closes #43231 See merge request gitlab-org/gitlab-ce!17132
* Merge branch ↵Rémy Coutable2018-02-153-120/+58
| | | | | | | | | '43240-external-tracker-issues-don-t-have-the-correct-closing-text-appended-to-mrs' into 'master' Resolve "External tracker issues don't have the correct closing text appended to MRs" Closes #1 et #43240 See merge request gitlab-org/gitlab-ce!17109
* Merge branch 'expired-ci-artifacts' into 'master'Grzegorz Bizon2018-02-155-6/+65
| | | | | Change SQL for expired artifacts to use new ci_job_artifacts.expire_at See merge request gitlab-org/gitlab-ce!16578
* Update VERSION to 10.5.0-rc7v10.5.0-rc7Mark Fletcher2018-02-151-1/+1
|
* Merge branch '10-5-stable-prepare-rc7' into '10-5-stable'Marin Jankovski2018-02-158-7/+115
|\ | | | | | | | | Prepare 10.5 RC7 release See merge request gitlab-org/gitlab-ce!17131
| * Merge branch 'sh-fix-error-500-licensee' into 'master'10-5-stable-prepare-rc7Douwe Maan2018-02-152-1/+21
| | | | | | | | | | | | | | Fix Error 500s loading repositories with inconsistent HEAD Closes #43268 See merge request gitlab-org/gitlab-ce!17128
| * Merge branch 'mc/fix/project-variables-scope' into 'master'Kamil Trzciński2018-02-156-6/+94
|/ | | | | | | Resolve "Project variables validate without any scopes disregarding environment_scope" Closes #43191 See merge request gitlab-org/gitlab-ce!17086
* Update VERSION to 10.5.0-rc6v10.5.0-rc6Mark Fletcher2018-02-141-1/+1
|
* Merge branch '10-5-stable-prepare-rc6' into '10-5-stable'Mark Fletcher2018-02-14126-12691/+17739
|\ | | | | | | | | Prepare 10.5 RC6 release See merge request gitlab-org/gitlab-ce!17111
| * Merge branch '42934-search-api-fix' into 'master'10-5-stable-prepare-rc6Sean McGivern2018-02-1412-22/+37
| | | | | | | | | | | | | | Add information about projects when searching in wiki_blobs, blobs, commits scopes Closes #42934 See merge request gitlab-org/gitlab-ce!17095
| * Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2018-02-1416-2933/+17627
| | | | | | | | | | Port of EE-translations See merge request gitlab-org/gitlab-ce!17081
| * Merge branch '43189-deployed-ingress-configmap-does-not-enable-metrics' into ↵Kamil Trzciński2018-02-141-1/+2
| | | | | | | | | | | | | | | | | | 'master' Fully enable nginx-ingress metrics Closes #43189 See merge request gitlab-org/gitlab-ce!17069
| * Merge branch 'jivl-fix-missing-js-selector-realtime-pipeline' into 'master'Filipa Lacerda2018-02-142-2/+2
| | | | | | | | | | Fixed missing js selector for the realtime pipelines commit component See merge request gitlab-org/gitlab-ce!17061
| * Merge branch 'ac/4878-fix-attachments-ext' into 'master'Nick Thomas2018-02-142-7/+11
| | | | | | | | | | Honour workhorse provided file name See merge request gitlab-org/gitlab-ce!17059
| * Merge branch 'remove_ldap_person_validation' into 'master'Stan Hu2018-02-143-24/+5
| | | | | | | | | | | | | | Remove problematic LDAP::Person validation for new strategy Closes #42412 and #42359 See merge request gitlab-org/gitlab-ce!16727
| * Merge branch 'jivl-update-katex' into 'master'Clement Ho2018-02-1490-9702/+55
|/ | | | | | | Updated katex library Closes #43032 See merge request gitlab-org/gitlab-ce!15864
* Update VERSION to 10.5.0-rc5v10.5.0-rc5Ian Baum2018-02-131-1/+1
|
* Merge branch '10-5-stable-prepare-rc5' into '10-5-stable'Ian Baum2018-02-1320-180/+179
|\ | | | | | | | | Prepare 10.5 RC5 release See merge request gitlab-org/gitlab-ce!17083
| * Merge branch 'qa/gb/do-not-require-test-network-in-pipeline-tests' into 'master'10-5-stable-prepare-rc5Robert Speicher2018-02-132-2/+12
| | | | | | | | | | | | | | Do not attach runner to a non-exsiting network in QA Closes gitlab-qa#180 See merge request gitlab-org/gitlab-ce!17028
| * Merge branch 'whitelisting' into 'master'Yorick Peterse2018-02-133-22/+3
| | | | | | | | | | Remove Sentry reporting for query limiting See merge request gitlab-org/gitlab-ce!17092
| * Merge branch 'sh-fix-issue-43193' into 'master'Sean McGivern2018-02-132-14/+26
| | | | | | | | | | | | | | Fix Error 500s creating merge requests with external issue tracker Closes #43193 See merge request gitlab-org/gitlab-ce!17073
| * Merge branch 'winh-new-branch-dropdown-style' into 'master'Phil Hughes2018-02-1310-139/+135
| | | | | | | | | | | | | | Cleanup new branch/merge request form in issues Closes #41938 See merge request gitlab-org/gitlab-ce!16854
| * Merge branch 'jivl-fix-warning-messages-labels-milestones' into 'master'Clement Ho2018-02-133-3/+3
|/ | | | | | | Fix warning messages for promoting labels and milestones Closes #42900 See merge request gitlab-org/gitlab-ce!17063
* Update VERSION to 10.5.0-rc4v10.5.0-rc4Ian Baum2018-02-121-1/+1
|
* Merge branch '10-5-stable-prepare-rc4' into '10-5-stable'Stan Hu2018-02-1248-291/+178
|\ | | | | | | | | Prepare 10.5 RC4 release See merge request gitlab-org/gitlab-ce!17055
| * Merge branch 'sh-disable-query-limiter' into 'master'Ian Baum2018-02-122-5/+7
| | | | | | | | | | Disable query limiting warnings for now on GitLab.com See merge request gitlab-org/gitlab-ce!17067
| * Merge branch ↵10-5-stable-prepare-rc4Ian Baum2018-02-126-113/+17
| | | | | | | | | | | | | | 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master' Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" See merge request gitlab-org/gitlab-ce!17062
| * Merge branch '42928-default-protected-variables-to-off' into 'master'Filipa Lacerda2018-02-124-7/+7
| | | | | | | | | | | | | | Default CI variables to unprotected Closes #42928 See merge request gitlab-org/gitlab-ce!17039
| * Merge branch '42937-search-api-fix' into 'master'Grzegorz Bizon2018-02-122-4/+24
| | | | | | | | | | | | | | API - fix searching in group/project specified by path Closes #42937 See merge request gitlab-org/gitlab-ce!17033
| * Merge branch '180-qa-fix-api-spec' into 'master'Grzegorz Bizon2018-02-121-2/+2
| | | | | | | | | | | | | | Resolve 10.5.0 RC1 QA Failure with failing API specs Closes gitlab-qa#180 See merge request gitlab-org/gitlab-ce!16999
| * Merge branch 'docs-for-commits-linking-to-mrs' into 'master'Sean McGivern2018-02-121-1/+14
| | | | | | | | | | Add docs for MR link in commit page See merge request gitlab-org/gitlab-ce!16994
| * Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'Yorick Peterse2018-02-125-34/+30
| | | | | | | | | | | | | | Fix concurrent fork network migrations Closes #41487 See merge request gitlab-org/gitlab-ce!16988
| * Merge branch 'issues-in-subgroups' into 'master'Sean McGivern2018-02-122-6/+4
| | | | | | | | | | Issues and merge requests in subgroups docs See merge request gitlab-org/gitlab-ce!16978
| * Merge branch 'update-docs-labels-ce' into 'master'Marcia Ramos2018-02-1225-119/+70
| | | | | | | | | | Update docs labels CE See merge request gitlab-org/gitlab-ce!16974
| * Merge branch 'bvl-pot-merge-conflicts-docs' into 'master'Achilleas Pipinellis2018-02-121-0/+3
|/ | | | | Add a note about merge conflicts in `gitlab.pot` See merge request gitlab-org/gitlab-ce!16971
* Update VERSION to 10.5.0-rc3v10.5.0-rc3Ian Baum2018-02-091-1/+1
|
* Merge branch '10-5-stable-prepare-rc3' into '10-5-stable'Ian Baum2018-02-0930-130/+651
|\ | | | | | | | | Prepare 10.5 RC3 release See merge request gitlab-org/gitlab-ce!17026
| * Merge branch 'rs-pick-security' into 'master'Stan Hu2018-02-0930-130/+651
|/ | | | | Pick 10.4.3 fixes into master See merge request gitlab-org/gitlab-ce!17040
* Update VERSION to 10.5.0-rc2v10.5.0-rc210-5-stable-prepare-rc3Ian Baum2018-02-081-1/+1
|
* Merge branch '10-5-stable-prepare-rc2' into '10-5-stable'Ian Baum2018-02-0813-21/+1670
|\ | | | | | | | | Prepare 10.5 RC2 release See merge request gitlab-org/gitlab-ce!17001
| * Merge branch 'bump-gitlab-shell-version-to-6-0-3' into 'master'10-5-stable-prepare-rc2Marin Jankovski2018-02-081-1/+1
| | | | | | | | | | Bumps Gitlab Shell version to 6.0.3 See merge request gitlab-org/gitlab-ce!17008
| * Merge branch '10-5-update-dependencies-license-list' into 'master'Marin Jankovski2018-02-081-9/+1259
| | | | | | | | | | 10.5 Update the dependencies license list See merge request gitlab-org/gitlab-ce!16998
| * Merge branch '10-5-update-templates' into 'master'Marin Jankovski2018-02-088-6/+42
| | | | | | | | | | 10.5 Update the `.gitignore`, `.gitlab-ci.yml`, and `Dockerfile` templates See merge request gitlab-org/gitlab-ce!16997
| * Merge branch '10-5-ce-update-guides' into 'master'Marin Jankovski2018-02-081-0/+361
| | | | | | | | | | 10.5 Create the "Update" guides See merge request gitlab-org/gitlab-ce!16996
| * Merge branch '10-5-update-source-install-guide' into 'master'Marin Jankovski2018-02-081-2/+2
| | | | | | | | | | 10.5 Update the "Installation from Source" guide See merge request gitlab-org/gitlab-ce!16995
View Lorry Controller Status