summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* spec fixes10-0-breadcrumb-item-linksPhil Hughes2017-11-011-2/+2
|
* Stable port of breadcrumb-item-linksTim Zallmann2017-11-014-6/+15
|
* Update VERSION to 10.0.4v10.0.4Jarka Kadlecova2017-10-161-1/+1
|
* Update CHANGELOG.md for 10.0.4Jarka Kadlecova2017-10-164-15/+6
| | | [ci skip]
* Remove redundant specRobert Speicher2017-10-111-6/+0
|
* Merge branch 'port-ee-3435' into 'security-10-0'Robert Speicher2017-10-114-31/+11
| | | | | [10.0 CE] Prevent "Related Issues" from leaking confidential issues See merge request gitlab/gitlabhq!2193
* Merge branch '38126-security-username-change' into 'security-10-0'Douwe Maan2017-10-114-13/+50
| | | | | Move project repositories between namespaces when renaming users (10.0) See merge request gitlab/gitlabhq!2200
* Merge branch 'winh-search-bar-xss' into 'security-10-0'Phil Hughes2017-10-112-2/+25
| | | | | Escape user name in filtered search bar See merge request gitlab/gitlabhq!2194
* Merge branch 'rs-sanitize-unicode-in-protocol' into 'security-10-0'Douwe Maan2017-10-113-2/+22
| | | | | [10.0] Prevent a persistent XSS in user-provided markup See merge request gitlab/gitlabhq!2199
* Merge branch 'fix-arbitrary-redirect-vulnerability' into 'security-10-0'Robert Speicher2017-10-113-10/+15
| | | | | Fix arbitrary redirect location vulnerability See merge request gitlab/gitlabhq!2192
* Merge branch 'rs-qa-default-password' into 'master'Grzegorz Bizon2017-10-102-4/+39
| | | | | | | | Use the default password from the GDK's root user Closes gitlab-qa#73 See merge request gitlab-org/gitlab-ce!14701
* Update VERSION to 10.0.3v10.0.3Jarka Kadlecova2017-10-051-1/+1
|
* Update CHANGELOG.md for 10.0.3Jarka Kadlecova2017-10-0515-70/+17
| | | [ci skip]
* Merge branch '10-0-stable-patch-3' into '10-0-stable'Jarka Kadlecova2017-10-0429-57/+216
|\ | | | | | | | | Prepare 10.0.3 release See merge request gitlab-org/gitlab-ce!14590
| * Merge branch 'fix-kubectl-180' into 'master'10-0-stable-patch-3Kamil Trzciński2017-10-034-3/+8
| | | | | | | | | | | | | | Fix broken certificate-authority-data with kubectl >= 1.8.0 Closes #38685 See merge request gitlab-org/gitlab-ce!14635
| * Merge branch 'sh-fix-import-repos' into 'master'Robert Speicher2017-10-035-3/+31
| | | | | | | | | | | | | | Fix gitlab-rake gitlab:import:repos task Closes #37682 See merge request gitlab-org/gitlab-ce!14597
| * Remove `empty_repo?` from `MEMOIZED_CACHED_METHODS`Robert Speicher2017-10-021-1/+1
| | | | | | | | It's only cached in 10.1 currently.
| * Merge branch 'sh-fix-gitlab-qa-admin' into 'master'Grzegorz Bizon2017-10-021-9/+4
| | | | | | | | | | | | | | Fix Admin -> License selector for GitLab QA specs Closes gitlab-qa#68 See merge request gitlab-org/gitlab-ce!14599
| * Merge branch 'sh-restore-all-refs-backup' into 'master'Sean McGivern2017-10-022-1/+6
| | | | | | | | | | | | | | Ensure all refs are restored on a backup/restore Closes #38352 See merge request gitlab-org/gitlab-ce!14595
| * Merge branch 'sh-fix-issue-38646' into 'master'Grzegorz Bizon2017-10-023-4/+23
| | | | | | | | | | | | | | Fix pushes to an empty repository not invalidating has_visible_content? cache Closes #38646 See merge request gitlab-org/gitlab-ce!14613
| * Merge branch '38528-build-url' into 'master'Phil Hughes2017-09-293-1/+20
| | | | | | | | | | | | | | Fixes data parameter not being sent in ajax request for jobs log Closes #38528 See merge request gitlab-org/gitlab-ce!14564
| * Merge branch 'docs-fix-auto-devops-banner-feature-flag' into 'master'Grzegorz Bizon2017-09-291-1/+1
| | | | | | | | | | | | | | Fix Auto DevOps banner feature flag Closes #38576 See merge request gitlab-org/gitlab-ce!14576
| * Merge branch 'make-has-visible-commit-more-efficient' into 'master'Rémy Coutable2017-09-296-22/+91
| | | | | | | | | | Make Repository#has_visible_content more efficient See merge request gitlab-org/gitlab-ce!14554
| * Merge branch 'bvl-fix-close-issuable-link' into 'master'Rémy Coutable2017-09-294-11/+25
| | | | | | | | | | | | | | Use relative paths for opening and closing issuables Closes #35822 See merge request gitlab-org/gitlab-ce!14555
| * Merge branch '38582-popover-badge' into 'master'Phil Hughes2017-09-292-2/+7
|/ | | | | | | Improves UX of autodevops popover to match gpg one Closes #38582 See merge request gitlab-org/gitlab-ce!14582
* Merge branch '10-0-stable-patch-3' into '10-0-stable'Robert Speicher2017-09-2921-90/+305
|\ | | | | | | | | Prepare 10.0.3 release See merge request gitlab-org/gitlab-ce!14568
| * Merge branch ↵Rémy Coutable2017-09-283-2/+16
| | | | | | | | | | | | | | | | | | '37467-helper-method-from-users-endpoint-overrides-api-helper-method' into 'master' find_user users helper method no longer overrides find_user API helper method. Closes #37467 See merge request gitlab-org/gitlab-ce!14418
| * Merge branch '38476-improve-merge-jid-cleanup-on-merge-process' into 'master'Sean McGivern2017-09-283-10/+37
| | | | | | | | | | | | | | Clean merge_jid whenever necessary on the merge process Closes #38476 See merge request gitlab-org/gitlab-ce!14540
| * Merge branch 'zj-repo-gitaly' into 'master'Sean McGivern2017-09-283-19/+18
| | | | | | | | | | | | | | RepositoryExists is always called with #gitaly_migration Closes #38333 See merge request gitlab-org/gitlab-ce!14513
| * Merge branch 'commit-side-by-side-comment' into 'master'Filipa Lacerda2017-09-283-3/+44
| | | | | | | | | | | | | | Fixes commit comments in parallel diff view Closes #38117 See merge request gitlab-org/gitlab-ce!14529
| * Merge branch '38319-nomethoderror-undefined-method-sha-for-nil-nilclass' ↵Douwe Maan2017-09-283-2/+90
| | | | | | | | | | | | | | | | | | into 'master' Resolve "NoMethodError: undefined method `sha' for nil:NilClass" Closes #38319 See merge request gitlab-org/gitlab-ce!14547
| * Merge branch 'dm-api-unauthorized' into 'master'Sean McGivern2017-09-284-54/+83
| | | | | | | | | | | | | | Make sure API responds with 401 when invalid authentication info is provided Closes #38438 See merge request gitlab-org/gitlab-ce!14525
| * Merge branch 'fix-mr-sidebar-counter-after-merge' into 'master'Robert Speicher2017-09-283-0/+17
|/ | | | | | | Clear merge requests counter cache after merge Closes gitlab-ee#3573 and #38344 See merge request gitlab-org/gitlab-ce!14563
* Update VERSION to 10.0.2v10.0.2Jarka Kadlecova2017-09-271-1/+1
|
* Update CHANGELOG.md for 10.0.2Jarka Kadlecova2017-09-275-20/+7
| | | [ci skip]
* Merge branch '10-0-stable-patch-2' into '10-0-stable'Jarka Kadlecova2017-09-2628-132/+256
|\ | | | | | | | | Prepare 10.0.2 release See merge request gitlab-org/gitlab-ce!14499
| * Merge branch 'winh-user-dropdown-nowrap' into 'master'10-0-stable-patch-2Phil Hughes2017-09-261-0/+8
| | | | | | | | | | | | | | Avoid wrapping users in dropdown Closes #38077 See merge request gitlab-org/gitlab-ce!14410
| * Merge branch 'fix-locked-shared-runners-problem' into 'master'Kamil Trzciński2017-09-263-52/+24
| | | | | | | | | | | | | | Fix locked shared runners problem Closes gitlab-runner#2782 See merge request gitlab-org/gitlab-ce!14483
| * Merge branch '37912-fix-dash-in-note-access-role' into 'master'Rémy Coutable2017-09-262-1/+7
| | | | | | | | | | | | | | Fix a dash being rendered in the note's access role Closes #37912 See merge request gitlab-org/gitlab-ce!14450
| * Merge branch 'acet-switch-markdown-pane' into 'master'Jacob Schatz2017-09-261-1/+3
| | | | | | | | | | | | | | IssueNotes: Switch back to Write pane when note cancel or submit. Closes #37907 See merge request gitlab-org/gitlab-ce!14402
| * Merge branch '38189-fix-user-avatar-url-cdn' into 'master'Douwe Maan2017-09-263-50/+79
| | | | | | | | | | | | | | Prevent URL concatenation for avatars Closes #38189 See merge request gitlab-org/gitlab-ce!14437
| * Merge branch 'sh-fix-email-provider-take2' into 'master'Yorick Peterse2017-09-262-2/+2
| | | | | | | | | | | | | | Fix PG::UniqueViolation external_email migration Closes #38246 See merge request gitlab-org/gitlab-ce!14474
| * Merge branch '38280-undefined-run_command-when-running-rake-gitlab-check' ↵Douwe Maan2017-09-265-2/+44
| | | | | | | | | | | | | | | | | | into 'master' Resolve "Undefined run_command when running rake gitlab:check" Closes #38280 See merge request gitlab-org/gitlab-ce!14469
| * Merge branch 'rs-allow-name-on-anchors' into 'master'Douwe Maan2017-09-263-3/+13
| | | | | | | | | | | | | | Re-allow `name` attribute on user-provided anchor HTML Closes #38196 See merge request gitlab-org/gitlab-ce!14452
| * Merge branch '37287-remove-nav-gradient' into 'master'Phil Hughes2017-09-261-2/+2
| | | | | | | | | | | | | | Remove navbar gradient Closes #37287 See merge request gitlab-org/gitlab-ce!14457
| * Merge branch 'sh-blob-raw-check' into 'master'Douwe Maan2017-09-262-0/+5
| | | | | | | | | | Ensure that Blob.raw returns always returns a valid blob object See merge request gitlab-org/gitlab-ce!14412
| * Merge branch 'acet-fix-double-note-render' into 'master'Jacob Schatz2017-09-265-19/+47
| | | | | | | | | | | | | | Fix rendering double note issue Closes #38139 See merge request gitlab-org/gitlab-ce!14429
| * Merge branch 'acet-fix-comment-form-resize' into 'master'Jacob Schatz2017-09-262-0/+22
|/ | | | | | | IssueNotes: Resize comment form after note submit and discard. Closes #38115 See merge request gitlab-org/gitlab-ce!14401
* Update VERSION to 10.0.1v10.0.1Stan Hu2017-09-231-1/+1
|
* Update CHANGELOG.md for 10.0.1Stan Hu2017-09-232-5/+4
| | | [ci skip]
View Lorry Controller Status