summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix error loading javascript in edit tags formfix-tags-10-5Clement Ho2018-03-021-1/+1
|
* Update VERSION to 10.5.2v10.5.2Ian Baum2018-02-251-1/+1
|
* Update CHANGELOG.md for 10.5.2Ian Baum2018-02-2513-60/+21
| | | [ci skip]
* Merge branch '10-5-stable-patch-2' into '10-5-stable'Stan Hu2018-02-2386-368/+648
|\ | | | | | | | | Prepare 10.5.2 release See merge request gitlab-org/gitlab-ce!17322
| * Convert Gitaly commit parent IDs to array as early as possibleSean McGivern2018-02-231-1/+1
| | | | | | | | | | The tracking issue if this causes problems is https://gitlab.com/gitlab-org/gitaly/issues/1028
| * Merge branch 'zj-unit-test-gitaly-arrays' into 'master'Sean McGivern2018-02-232-0/+5
| | | | | | | | | | Add unit tests for Gitaly types See merge request gitlab-org/gitlab-ce!17237
| * Revert "Merge branch 'zj-unit-test-gitaly-arrays' into 'master'"Ian Baum2018-02-232-5/+0
| | | | | | | | This reverts commit 3a91c166743f914a2db7a4d8c5bc7af637d3aff4.
| * Merge branch 'fix-diff-flash' into 'master'Clement Ho2018-02-231-1/+3
| | | | | | | | | | only show error if there is an error See merge request gitlab-org/gitlab-ce!17228
| * Merge branch '41619-turn-on-legacy-authorization-for-new-clusters-on-gke' ↵Kamil Trzciński2018-02-234-3/+15
| | | | | | | | | | | | | | | | | | into 'master' Enable "Legacy Authorization" by default when creating a Cluster on GCP Closes #41619 See merge request gitlab-org/gitlab-ce!17302
| * Merge branch 'git-access-existence-check' into 'master'Robert Speicher2018-02-235-7/+29
| | | | | | | | | | | | | | Fix repo existence check in GitAccessWiki Closes #43385 and gitlab-com/infrastructure#3734 See merge request gitlab-org/gitlab-ce!17268
| * Merge branch 'fix-500-for-invalid-upload-path' into 'master'Sean McGivern2018-02-236-1/+40
| | | | | | | | | | | | | | Fix 500 error when loading an invalid upload URL Closes gitlab-ee#4998 See merge request gitlab-org/gitlab-ce!17267
| * Merge branch '43373-fix-cache-index-appending' into 'master'Kamil Trzciński2018-02-233-2/+7
| | | | | | | | | | | | | | Resolve "cache key for CI stopped working" Closes #43373 See merge request gitlab-org/gitlab-ce!17260
| * Merge branch 'minor-improvement-to-k8s-monitoring-docs' into 'master'Marcia Ramos2018-02-231-2/+2
| | | | | | | | | | Improve link for CI environment variable, wording. See merge request gitlab-org/gitlab-ce!17252
| * Merge branch 'update-browser-perf-testing-example-doc' into 'master'Marcia Ramos2018-02-231-4/+14
| | | | | | | | | | Update Browser Performance Testing Example See merge request gitlab-org/gitlab-ce!17249
| * Merge branch 'docs-milestones-refactor' into 'master'Marcia Ramos2018-02-238-40/+88
| | | | | | | | | | Docs milestones refactor See merge request gitlab-org/gitlab-ce!17247
| * Merge branch 'zj-unit-test-gitaly-arrays' into 'master'Sean McGivern2018-02-232-0/+5
| | | | | | | | | | Add unit tests for Gitaly types See merge request gitlab-org/gitlab-ce!17237
| * Merge branch '43424-put_all_event_metrics_behind_feature_flags' into 'master'Douwe Maan2018-02-231-2/+3
| | | | | | | | | | | | | | Fix for sidekiq metrics set cardinality growing unbounded Closes #43424 See merge request gitlab-org/gitlab-ce!17235
| * Merge branch 'docs/lfs-lock' into 'master'Marcia Ramos2018-02-231-1/+3
| | | | | | | | | | Add version which LFS lock was introduced See merge request gitlab-org/gitlab-ce!17233
| * Merge branch 'zj-branch-contains-git-message' into 'master'Douwe Maan2018-02-233-10/+48
| | | | | | | | | | Allow branchnames to be named the same as the commit it points to See merge request gitlab-org/gitlab-ce!17231
| * Merge branch 'update-prometheus-10-5-docs' into 'master'Marcia Ramos2018-02-238-209/+63
| | | | | | | | | | Update prometheus docs for 10.5 See merge request gitlab-org/gitlab-ce!17229
| * Merge branch 'kp-fix-stacked-bar-progress-value-clipping' into 'master'Filipa Lacerda2018-02-232-1/+6
| | | | | | | | | | | | | | Fix single digit value clipping for stacked progress bar Closes gitlab-ee#4864 See merge request gitlab-org/gitlab-ce!17217
| * Merge branch 'flipper-caching' into 'master'Douwe Maan2018-02-232-1/+6
| | | | | | | | | | | | | | Increase feature flag cache TTL to one hour Closes #40854 See merge request gitlab-org/gitlab-ce!17213
| * Merge branch 'sh-guard-read-only-user-updates' into 'master'Nick Thomas2018-02-233-0/+15
| | | | | | | | | | | | | | Don't attempt to update user tracked fields if database is in read-only Closes gitlab-ee#4972 See merge request gitlab-org/gitlab-ce!17200
| * Merge branch '41461-project-members-slow-due-to-sql' into 'master'Yorick Peterse2018-02-232-12/+50
| | | | | | | | | | | | | | Simplify database queries in MembersFinder and improve performance for Projects::ProjectMembersController#index Closes #41461 See merge request gitlab-org/gitlab-ce!17190
| * Merge branch 'docs-replace-prod-names' into 'master'🚄 Job van der Voort 🚀2018-02-2311-22/+45
| | | | | | | | | | Docs: search/replace "Enterprise Edition" and adjust when applicable See merge request gitlab-org/gitlab-ce!17161
| * Merge branch 'users-autocomplete' into 'master'10-5-stable-patch-2Douwe Maan2018-02-2310-25/+84
| | | | | | | | | | | | Improve performance of searching for and auto completing of users See merge request gitlab-org/gitlab-ce!17158
| * Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'Sean McGivern2018-02-233-5/+10
| | | | | | | | | | | | | | Avoid slow File Lock checks when not used Closes #43339 See merge request gitlab-org/gitlab-ce!17140
| * Merge branch 'jej/fix-slow-lfs-object-check' into 'master'Douwe Maan2018-02-235-9/+33
| | | | | | | | | | | | | | Only check LFS integrity for first branch in push Closes #41141 See merge request gitlab-org/gitlab-ce!17098
| * Merge branch '42877-snippets-dashboard-slow' into 'master'Yorick Peterse2018-02-235-13/+66
| | | | | | | | | | | | | | | | Improve query performance for Dashboard::SnippetsController#index Closes #42877 See merge request gitlab-org/gitlab-ce!17088
| * Merge branch '34130-null-pipes' into 'master'Fatih Acet2018-02-233-0/+15
|/ | | | | Resolve "Merge request says "Could not connect to the CI server", no CI or integration is configured" See merge request gitlab-org/gitlab-ce!17053
* Update VERSION to 10.5.1v10.5.1Ian Baum2018-02-221-1/+1
|
* Update CHANGELOG.md for 10.5.1Ian Baum2018-02-221-0/+4
| | | [ci skip]
* Update VERSION to 10.5.0v10.5.010-5-stable-patch-1Mark Fletcher2018-02-221-1/+1
|
* Update CHANGELOG.md for 10.5.0Mark Fletcher2018-02-22171-860/+192
| | | [ci skip]
* Update VERSION to 10.5.0-rc10v10.5.0-rc10Robert Speicher2018-02-201-1/+1
|
* Merge branch '10-5-stable-prepare-rc10' into '10-5-stable'Stan Hu2018-02-2052-20/+1357
|\ | | | | | | | | Prepare 10.5 RC10 release See merge request gitlab-org/gitlab-ce!17250
| * Merge branch '29497-pages-custom-domain-dns-verification' into 'security-10-5'Robert Speicher2018-02-2052-20/+1357
|/ | | | | Add DNS verification to Pages custom domains (GitLab 10.5) See merge request gitlab/gitlabhq!2322
* Update VERSION to 10.5.0-rc9v10.5.0-rc9Mark Fletcher2018-02-191-1/+1
|
* Merge branch '10-5-stable-prepare-rc9' into '10-5-stable'Mark Fletcher2018-02-1921-110/+169
|\ | | | | | | | | Prepare 10.5 RC9 release See merge request gitlab-org/gitlab-ce!17210
| * Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'Sean McGivern2018-02-193-0/+18
| | | | | | | | | | | | | | Fix squash rebase not working when diff contained encoded data Closes gitlab-ee#4960 See merge request gitlab-org/gitlab-ce!17205
| * Merge branch 'revert-215dff76' into 'master'Ian Baum2018-02-192-38/+4
| | | | | | | | | | Revert "Merge branch 'expired-ci-artifacts' into 'master'" See merge request gitlab-org/gitlab-ce!17193
| * Merge branch '43296-fix-specs-broken-by-hardcoding-paths' into 'master'Robert Speicher2018-02-194-5/+5
| | | | | | | | | | | | | | Fix order dependencies in some specs Closes #43296 See merge request gitlab-org/gitlab-ce!17189
| * Merge branch 'update-vendored-auto-devops-template-for-latest-sast-changes' ↵Dmitriy Zaporozhets2018-02-191-1/+9
| | | | | | | | | | | | | | into 'master' Update vendored AutoDevOps YML for latest SAST changes See merge request gitlab-org/gitlab-ce!17178
| * Merge branch '42641-monaco-service-workers-do-not-work-with-cdn-enabled' ↵Tim Zallmann2018-02-192-0/+10
| | | | | | | | | | | | | | | | | | into 'master' Resolve "Monaco service workers do not work with CDN enabled" Closes #42641 See merge request gitlab-org/gitlab-ce!17021
| * Merge branch 'docs/kubernetes-rename' into 'master'Marcia Ramos2018-02-192-64/+55
| | | | | | | | | | | | | | Replace "Kubernetes cluster" where appropriate in docs Closes #42939 See merge request gitlab-org/gitlab-ce!17089
| * Merge branch 'fj-fixed-bug-17054' into 'master'Douwe Maan2018-02-191-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-197-2/+68
|/ | | | | | | Fixed user synced attributes metadata after removing current provider Closes #37528 See merge request gitlab-org/gitlab-ce!17054
* Update VERSION to 10.5.0-rc8v10.5.0-rc8Robert Speicher2018-02-151-1/+1
|
* Merge branch '10-5-stable-prepare-rc8' into '10-5-stable'Robert Speicher2018-02-1513-246/+244
|\ | | | | | | | | Prepare 10.5 RC8 release See merge request gitlab-org/gitlab-ce!17155
| * Resolve conflict in prepare_untracked_uploads_spec.rbMichael Kozono2018-02-151-27/+0
| |
View Lorry Controller Status