summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 10.4.4v10.4.4Ian Baum2018-02-161-1/+1
|
* Update CHANGELOG.md for 10.4.4Ian Baum2018-02-1611-51/+19
| | | [ci skip]
* Merge branch '10-4-stable-patch-4' into '10-4-stable'Stan Hu2018-02-1549-318/+561
|\ | | | | | | | | Prepare 10.4.4 release See merge request gitlab-org/gitlab-ce!17124
| * Merge branch 'fj-fixed-bug-17054' into 'master'Douwe Maan2018-02-151-1/+1
| | | | | | | | | | Fixed bug with the user synced attributes when the user doesn't exist See merge request gitlab-org/gitlab-ce!17152
| * Merge branch 'fj-37528-error-after-disabling-ldap' into 'master'Douwe Maan2018-02-157-2/+68
| | | | | | | | | | | | | | Fixed user synced attributes metadata after removing current provider Closes #37528 See merge request gitlab-org/gitlab-ce!17054
| * Merge branch 'update-prometheus-vendor-yml' into '10-4-stable-patch-4'Robert Speicher2018-02-151-77/+59
| |\ | | | | | | | | | | | | | | | | | | Update Prometheus vendor YML for 2.1 support [ci skip] See merge request gitlab-org/gitlab-ce!17142
| | * Update Prometheus vendor YML for 2.1 supportupdate-prometheus-vendor-ymlJoshua Lambert2018-02-151-77/+59
| | |
| * | Merge branch 'mk-10-4-4-fix-no-untracked-upload-files-error' into ↵10-4-stable-patch-4Robert Speicher2018-02-155-46/+112
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | '10-4-stable-patch-4' [10.4.4 port] Resolve "PrepareUntrackedUploads PostgreSQL syntax error" See merge request gitlab-org/gitlab-ce!17130
| | * | Fix dir exists spec errormk-10-4-4-fix-no-untracked-upload-files-errorMichael Kozono2018-02-141-1/+1
| | | |
| | * | Add changelog entryMichael Kozono2018-02-141-0/+5
| | | |
| | * | Schedule PopulateUntrackedUploads if neededMichael Kozono2018-02-142-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-142-54/+44
| | | |
| | * | Fix last batch size equals max batch size errorMichael Kozono2018-02-142-1/+25
| | |/
| * | Resolve spec/migrations/remove_project_labels_group_id_spec.rb failureRobert Speicher2018-02-151-1/+1
| |/
| * Merge branch 'dm-git-hook-popen' into 'master'Stan Hu2018-02-141-8/+14
| | | | | | | | | | Only set cwd on the newly spawned process, instead of the current one See merge request gitlab-org/gitlab-ce!16958
| * Merge branch 'dm-sidekiq-memory-killer-getcwd' into 'master'Stan Hu2018-02-141-1/+1
| | | | | | | | | | Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd See merge request gitlab-org/gitlab-ce!16954
| * Merge branch 'fix-migration-timestamp' into 'master'Stan Hu2018-02-141-0/+21
| | | | | | | | | | Update labels migration timestamp to run earlier than the one that removes namespaces to avoid issues See merge request gitlab-org/gitlab-ce!16907
| * Merge branch 'dm-user-namespace-route-path-validation' into 'master'Sean McGivern2018-02-146-16/+36
| | | | | | | | | | | | | | | | Validate user namespace before saving so that errors persist on model Closes #42140 See merge request gitlab-org/gitlab-ce!16902
| * Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into ↵Douwe Maan2018-02-143-1/+15
| | | | | | | | | | | | | | | | | | 'master' Avoid error when creating forks and restricted levels are defined Closes #42607 See merge request gitlab-org/gitlab-ce!16881
| * Merge branch '42696-gitlab-import-leaves-group_id-on-projectlabel' into 'master'Stan Hu2018-02-146-4/+50
| | | | | | | | | | | | | | | | Resolve "GitLab import leaves `group_id` on ProjectLabel" Closes #42696 See merge request gitlab-org/gitlab-ce!16877
| * Merge branch 'winh-new-branch-dropdown-style' into 'master'Phil Hughes2018-02-1410-139/+135
| | | | | | | | | | | | | | Cleanup new branch/merge request form in issues Closes #41938 See merge request gitlab-org/gitlab-ce!16854
| * Merge branch ↵Douwe Maan2018-02-143-0/+17
| | | | | | | | | | | | | | | | | | '42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass' into 'master' Resolve "Error 500 loading merge request: undefined method `index' for nil:NilClass" Closes #42160 See merge request gitlab-org/gitlab-ce!16795
| * Merge branch 'sh-fix-jira-trailing-slash' into 'master'Robert Speicher2018-02-143-1/+29
| | | | | | | | | | | | | | Fix JIRA not working when a trailing slash is included Closes #42494 See merge request gitlab-org/gitlab-ce!16748
| * 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 '42591-update-nokogiri' into 'master'Stan Hu2018-02-073-3/+8
| | | | | | | Resolve "Update Nokogiri to 1.8.2" Closes #42591 See merge request gitlab-org/gitlab-ce!16807
* Update VERSION to 10.4.3v10.4.3Luke Bennett2018-02-051-1/+1
|
* Update CHANGELOG.md for 10.4.3Luke Bennett2018-02-055-20/+10
| | | [ci skip]
* Revert change to schema versionRobert Speicher2018-02-021-1/+1
|
* Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'Kamil Trzciński2018-02-025-9/+25
| | | | | Fix using wildcards in protected tags to expose protected variables See merge request gitlab/gitlabhq!2306
* Merge branch 'fix-mermaid-xss' into 'security-10-4'Douwe Maan2018-01-3110-16/+131
| | | | | [10.4] Fix stored XSS in code blocks See merge request gitlab/gitlabhq!2316
* Merge branch 'fix/gh-namespace-issue' into 'security-10-4'James Lopez2018-01-317-30/+88
| | | | | [10.4] Fix GH namespace security issue See merge request gitlab/gitlabhq!2295
* Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into ↵Robert Speicher2018-01-315-2/+19
| | | | | | | 'security-10-4' Restrict Todo API mark_as_done endpoint to the user's todos only See merge request gitlab/gitlabhq!2313
* Merge branch ↵Douwe Maan2018-01-319-75/+410
| | | | | | | 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4' [Port for security-10-4]: Makes SnippetFinder ensure feature visibility See merge request gitlab/gitlabhq!2312
* Update VERSION to 10.4.2v10.4.2Mark Fletcher2018-01-301-1/+1
|
* Update CHANGELOG.md for 10.4.2Mark Fletcher2018-01-308-36/+16
| | | [ci skip]
* Merge branch 'vendor-auto-devops-template-in-10-4' into '10-4-stable'Robert Speicher2018-01-302-3/+34
|\ | | | | | | | | | | | | Update Auto-DevOps.gitlab-ci.yml [ci skip] See merge request gitlab-org/gitlab-ce!16691
| * Fix invalid changelog YAMLRobert Speicher2018-01-291-0/+0
| | | | | | | | [ci skip]
| * Add changelogvendor-auto-devops-template-in-10-4Fabio Busatto2018-01-291-0/+5
| |
| * Update Auto-DevOps.gitlab-ci.ymlFabio Busatto2018-01-241-3/+29
| |
* | Merge branch '10-4-stable-patch-2' into '10-4-stable'Robert Speicher2018-01-3027-62/+255
|\ \ | | | | | | | | | | | | Prepare 10.4.2 release See merge request gitlab-org/gitlab-ce!16772
| * | Merge branch ↵10-4-stable-patch-2Fatih Acet2018-01-292-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | '42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public' into 'master' Fix visibility of "Allow users to request access" option in public projects See merge request gitlab-org/gitlab-ce!16485
| * | Merge branch 'fix-local-rspec-tests' into 'master'Mike Greiling2018-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | Fix local RSpec tests due to bug in `webpack_bundle_tag` Closes #42368 See merge request gitlab-org/gitlab-ce!16724
| * | Merge branch ↵Douwe Maan2018-01-2911-8/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | '42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error' into 'master' Resolve "Import from GitLab.com fails (destination already exists and is not an empty directory error)." Closes #42327 See merge request gitlab-org/gitlab-ce!16714
| * | Merge branch ↵Rémy Coutable2018-01-293-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master' Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT" Closes #42161 See merge request gitlab-org/gitlab-ce!16637
| * | Merge branch 'fix-postgresql-table-grant' into 'master'Stan Hu2018-01-292-20/+35
| | | | | | | | | | | | | | | | | | | | | Use has_table_privilege for TRIGGER on PostgreSQL Closes #38634 See merge request gitlab-org/gitlab-ce!16618
| * | Merge branch 'fj-42112-fix-deploy-keys-migration-mysql' into 'master'Stan Hu2018-01-293-28/+111
| | | | | | | | | | | | | | | Fix bug in security release with deploy keys migration See merge request gitlab-org/gitlab-ce!16531
| * | Merge branch '32546-cannot-copy-paste-on-ios' into 'master'Phil Hughes2018-01-292-0/+12
| | | | | | | | | | | | | | | | | | | | | Resolve "Cannot copy/paste on iOS" Closes #32546 See merge request gitlab-org/gitlab-ce!15804
| * | Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-293-2/+7
|/ / | | | | | | | | | | | | Fix cache clear windows Closes #42487 See merge request gitlab-org/gitlab-ce!16740
* | Update VERSION to 10.4.1v10.4.1Robert Speicher2018-01-241-1/+1
| |
* | Update CHANGELOG.md for 10.4.1Robert Speicher2018-01-247-32/+15
|/ | | [ci skip]
View Lorry Controller Status