summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.0.4v11.0.4GitLab Release Tools Bot2018-07-171-1/+1
|
* Update CHANGELOG.md for 11.0.4GitLab Release Tools Bot2018-07-172-5/+7
| | | [ci skip]
* Merge branch 'sh-fix-issue-49133-11-0-stable' into 'security-11-0'Dmitriy Zaporozhets2018-07-173-1/+14
| | | | | Fix symlink vulnerability in project import (11.0 port) See merge request gitlab/gitlabhq!2437
* Update VERSION to 11.0.3v11.0.3GitLab Release Tools Bot2018-07-051-1/+1
|
* Update CHANGELOG.md for 11.0.3GitLab Release Tools Bot2018-07-0515-71/+20
| | | [ci skip]
* Merge branch '11-0-stable-patch-3' into '11-0-stable'James Lopez2018-07-0549-134/+484
|\ | | | | | | | | Prepare 11.0.3 release See merge request gitlab-org/gitlab-ce!20361
| * Merge branch '48653-mr-target-branch-missing' into 'master'Sean McGivern2018-07-043-9/+32
| | | | | | | | | | | | | | Fix notify_conflict? raising exception due to absent branches Closes #48653 See merge request gitlab-org/gitlab-ce!20280
| * Merge branch 'other-label-items-border' into 'master'Fatih Acet2018-07-041-0/+2
| | | | | | | | | | Add border to "other" label items See merge request gitlab-org/gitlab-ce!20250
| * Merge branch 'sh-fix-move-issue-with-object-storage' into 'master'Robert Speicher2018-07-045-42/+121
| | | | | | | | | | | | | | Implement file copy for object storage when moving an issue Closes #48505 See merge request gitlab-org/gitlab-ce!20191
| * Merge branch 'issue_47729' into 'master'Sean McGivern2018-07-046-4/+134
| | | | | | | | | | | | | | Fix refresh cache for open issues count service Closes #47945 See merge request gitlab-org/gitlab-ce!19904
| * Merge branch 'fix-tooltip-flicker' into 'master'Mike Greiling2018-07-042-0/+10
| | | | | | | | | | | | | | Fix tooltip flicker Closes #48614 See merge request gitlab-org/gitlab-ce!20270
| * Merge branch ↵Clement Ho2018-07-042-1/+6
| | | | | | | | | | | | | | | | | | '48549-markdown-header-code-does-not-have-the-correct-font-size' into 'master' Resolve "Markdown header `code` does not have the correct font-size" Closes #48549 See merge request gitlab-org/gitlab-ce!20229
| * Merge branch '47516-pipe-scroll' into 'master'Mike Greiling2018-07-045-22/+62
| | | | | | | | | | | | | | Resolve "Tooltips scroll along the list within Pipeline jobs dropdown on MR widget" Closes #47516 See merge request gitlab-org/gitlab-ce!20171
| * Merge branch '48471-sidebar-on-jobs-and-wikis-is-missing-at-small-widths' ↵Mike Greiling2018-07-043-2/+7
| | | | | | | | | | | | | | | | | | into 'master' Resolve "Sidebar on jobs and wikis is missing at small widths" Closes #48471 See merge request gitlab-org/gitlab-ce!20188
| * Merge branch '48568-tooltips-flicker-when-highlighting-award-emoji' into ↵Fatih Acet2018-07-041-0/+2
| | | | | | | | | | | | | | | | | | 'master' Resolve "Tooltips flicker when highlighting award emoji" Closes #48568 See merge request gitlab-org/gitlab-ce!20235
| * Merge branch 'revert-merge-request-widget-button-height' into 'master'Clement Ho2018-07-042-1/+5
| | | | | | | | | | | | | | Revert merge request widget button max height Closes #48441 See merge request gitlab-org/gitlab-ce!20175
| * Merge branch 'dm-favicon-asset-host' into 'master'Sean McGivern2018-07-045-16/+10
| | | | | | | | | | | | | | Always serve favicon from main GitLab domain so that CI badge can be drawn over it Closes #47802 See merge request gitlab-org/gitlab-ce!20263
| * Merge branch 'bw-fix-ee-dashboard' into 'master'Stan Hu2018-07-042-4/+9
| | | | | | | | | | EE/Geo information paritals not rendered on dashboard See merge request gitlab-org/gitlab-ce!20276
| * Merge branch '47661-merge-request-box-disappearing-on-chrome' into 'master'Mike Greiling2018-07-042-17/+7
| | | | | | | | | | | | | | Replace deprecated bs.affix in merge request tabs with sticky polyfill Closes #47661 See merge request gitlab-org/gitlab-ce!20269
| * Merge branch '47769-fix_ambiguous_due_date_for_issue_scopes' into 'master'Sean McGivern2018-07-043-7/+39
| | | | | | | | | | | | | | Fix ambiguous due_date column for Issue scopes Closes #47769 See merge request gitlab-org/gitlab-ce!20251
| * Merge branch '48255-no-ui-element-to-edit-group-label' into 'master'Phil Hughes2018-07-042-4/+23
| | | | | | | | | | | | | | Resolve "No UI element to edit group label" Closes #48255 See merge request gitlab-org/gitlab-ce!20192
| * Merge branch '48528-fix-mr-autocompletion' into 'master'Sean McGivern2018-07-043-2/+7
| | | | | | | | | | | | | | Resolve "`!` autocomplete does not work anymore" Closes #48528 See merge request gitlab-org/gitlab-ce!20204
| * Merge branch '48461-search-dropdown-hides-shows-when-typing' into 'master'Mike Greiling2018-07-042-3/+8
|/ | | | | | | Resolve "Search dropdown hides & shows when typing" Closes #48461 See merge request gitlab-org/gitlab-ce!20187
* Update VERSION to 11.0.2v11.0.2GitLab Release Tools Bot2018-06-261-1/+1
|
* Update CHANGELOG.md for 11.0.2GitLab Release Tools Bot2018-06-2611-50/+22
| | | [ci skip]
* Merge branch '11-0-stable-patch-2' into '11-0-stable'Mayra Cabrera2018-06-26130-497/+1644
|\ | | | | | | | | Prepare 11.0.2 release See merge request gitlab-org/gitlab-ce!20139
| * Merge branch '48269-wiki-page-returns-error-code-502' into 'master'Douwe Maan2018-06-262-2/+9
| | | | | | | | | | | | | | Resolve "Wiki page returns error code 502" Closes #48269 See merge request gitlab-org/gitlab-ce!20174
| * Merge branch ↵Robert Speicher2018-06-263-6/+21
| | | | | | | | | | | | | | | | | | '48339-sorting-by-name-on-explore-projects-page-renders-a-500-error-when-logged-in' into 'master' Resolve "Sorting by name on explore projects page renders a 500 error when logged in" Closes #48339 See merge request gitlab-org/gitlab-ce!20162
| * Merge branch 'fix-webpack-node-env' into 'master'Clement Ho2018-06-262-1/+1
| | | | | | | | | | Enable webpack nodeEnv optimization See merge request gitlab-org/gitlab-ce!20075
| * Merge branch 'fix-alert-btn' into 'master'Mike Greiling2018-06-262-1/+6
| | | | | | | | | | | | | | Fix alert button styling so that they don't show up white Closes #48407 See merge request gitlab-org/gitlab-ce!20163
| * Merge branch 'go-1.10-source-installs' into 'master'Nick Thomas2018-06-262-11/+11
| | | | | | | | | | | | | | Use Go 1.10 for source installations Closes gitaly#1231 See merge request gitlab-org/gitlab-ce!19989
| * Merge branch 'mk/fix-n-plus-1-queries-in-uploads-check-rake-task' into 'master'11-0-stable-patch-2Stan Hu2018-06-253-9/+39
| | | | | | | | | | | | | | Fix N+1 queries in uploads check rake task Closes #47924 See merge request gitlab-org/gitlab-ce!20012
| * Merge branch 'mk/rake-task-verify-remote-files' into 'master'Stan Hu2018-06-2510-41/+147
| | | | | | | | | | | | | | Add support for verifying remote uploads, artifacts, and LFS objects in check rake tasks Closes #47139 See merge request gitlab-org/gitlab-ce!19501
| * Merge branch '11-0-stable' into 11-0-stable-patch-2Mayra Cabrera2018-06-2514-27/+107
| |\ | |/ |/|
* | Update VERSION to 11.0.1v11.0.1Alessio Caiazza2018-06-211-1/+1
| |
* | Update CHANGELOG.md for 11.0.1Alessio Caiazza2018-06-216-25/+11
| | | | | | [ci skip]
* | Merge branch 'security-html_escape_branch_name-11-0' into 'security-11-0'Filipa Lacerda2018-06-213-2/+25
| | | | | | | | | | [11.0] HTML escape branch name in project graphs page See merge request gitlab/gitlabhq!2413
* | Merge branch ↵Mayra Cabrera2018-06-213-14/+38
| | | | | | | | | | | | | | 'security-security-rd-do-not-show-internal-info-in-public-feed-11-0' into 'security-11-0' [11.0] Don't show internal info in public feed See merge request gitlab/gitlabhq!2396
* | Merge branch 'security-html_escape_usernames-11-0' into 'security-11-0'Mayra Cabrera2018-06-213-2/+15
| | | | | | | | | | [11.0] HTML escape the name of the user in ProjectsHelper#link_to_member See merge request gitlab/gitlabhq!2409
* | Merge branch 'security-fj-bumping-sanitize-gem-11-0' into 'security-11-0'Mayra Cabrera2018-06-215-7/+27
| | | | | | | | | | [11.0] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability See merge request gitlab/gitlabhq!2402
* | Merge branch 'security-2682-fix-xss-for-markdown-toc-11-0' into 'security-11-0'Mayra Cabrera2018-06-213-1/+15
| | | | | | | | | | [11.0] Fix xss for Markdown elements where [[_TOC_]] is enabled See merge request gitlab/gitlabhq!2412
| * Merge branch '6591-dont-load-omniauth-if-not-enabled' into 'master'Stan Hu2018-06-252-1/+8
| | | | | | | | | | | | | | Don't try to load omniauth if not enabled Closes gitlab-ee#6591 See merge request gitlab-org/gitlab-ce!20132
| * Merge branch '6598-notify-only-open-unmergeable-mr' into 'master'Sean McGivern2018-06-255-27/+52
| | | | | | | | | | Notify conflict only for opened/locked merge requests See merge request gitlab-org/gitlab-ce!20125
| * Merge branch 'mk/log-invalid-byte-sequence-in-us-ascii-qa' into 'master'Stan Hu2018-06-251-6/+18
| | | | | | | | | | Log push output on exception See merge request gitlab-org/gitlab-ce!20085
| * Merge branch 'sh-add-recaptcha-all-logins' into 'master'Robert Speicher2018-06-255-6/+88
| | | | | | | | | | | | | | Show a reCAPTCHA on signin page if custom header is set Closes #48184 See merge request gitlab-org/gitlab-ce!20076
| * Merge branch 'enforce-variable-value-to-be-a-string' into 'master'Grzegorz Bizon2018-06-257-19/+81
| | | | | | | | | | | | | | Enforce setting string as value of the CI/CD variable Closes #48210 See merge request gitlab-org/gitlab-ce!20061
| * Merge branch ↵Mayra Cabrera2018-06-259-69/+33
| |\ | | | | | | | | | | | | | | | | | | '47488-remove-unmergeable-notification-for-no-commits-11-0-port' into '11-0-stable-patch-2' [11.0] Notify only merge request unmergeable due to conflict See merge request gitlab-org/gitlab-ce!20042
| | * [11.0] Notify only merge request unmergeable due to conflictMark Chao2018-06-259-69/+33
| |/
| * Merge branch '48296-remove-top-padding-on-gpg-popovers' into 'master'Mike Greiling2018-06-251-0/+6
| | | | | | | | | | | | | | Resolve "Remove top padding on GPG popovers" Closes #48296 See merge request gitlab-org/gitlab-ce!20110
| * Merge branch 'rs-update-sprockets' into 'master'Stan Hu2018-06-251-1/+1
| | | | | | | | | | Bump sprockets to 3.7.2 to address CVE-2018-3760 See merge request gitlab-org/gitlab-ce!20109
View Lorry Controller Status