Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update VERSION to 11.4.4v11.4.4 | GitLab Release Tools Bot | 2018-10-30 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 11.4.4 | GitLab Release Tools Bot | 2018-10-30 | 2 | -5/+7 |
| | | | [ci skip] | ||||
* | Merge branch 'security-kubeclient-ssrf-11-4' into 'security-11-4' | Jan Provaznik | 2018-10-30 | 2 | -0/+26 |
| | | | | | [11.4] Security kubeclient ssrf See merge request gitlab/gitlabhq!2573 | ||||
* | Update VERSION to 11.4.3v11.4.3 | GitLab Release Tools Bot | 2018-10-26 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 11.4.3 | GitLab Release Tools Bot | 2018-10-26 | 1 | -0/+4 |
| | | | [ci skip] | ||||
* | Merge branch 'fix_pat_auth-11-4' into 'security-11-4' | Robert Speicher | 2018-10-26 | 3 | -5/+3 |
| | | | | | [11.4] Fix Token lookup for Git over HTTP and registry authentication See merge request gitlab/gitlabhq!2577 | ||||
* | Update VERSION to 11.4.2v11.4.2 | GitLab Release Tools Bot | 2018-10-25 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 11.4.2 | GitLab Release Tools Bot | 2018-10-25 | 6 | -25/+11 |
| | | | [ci skip] | ||||
* | Merge branch 'sh-block-other-localhost' into 'master' | Thiago Presa | 2018-10-24 | 3 | -1/+33 |
| | | | | | Block additional localhost addresses in UrlBlocker See merge request gitlab/gitlabhq!2487 | ||||
* | Merge branch 'security-11-4-2717-fix-issue-title-xss' into 'security-11-4' | Jan Provaznik | 2018-10-24 | 3 | -5/+26 |
| | | | | | [11.4] Escape issue title while template rendering to prevent XSS See merge request gitlab/gitlabhq!2571 | ||||
* | Merge branch 'security-redact-links-11-4' into 'security-11-4' | Jan Provaznik | 2018-10-24 | 11 | -1/+382 |
| | | | | | [11.4] Redact unsubscribe links in issuable texts See merge request gitlab/gitlabhq!2565 | ||||
* | Merge branch 'security-fix/control-headers-11-4' into 'security-11-4' | Jan Provaznik | 2018-10-24 | 4 | -7/+65 |
| | | | | | : [11.4] Resolve "Sensitive information is stored in browser history" See merge request gitlab/gitlabhq!2562 | ||||
* | Merge branch 'sh-validate-wiki-attachments-11-4' into 'security-11-4' | Thiago Presa | 2018-10-24 | 4 | -2/+32 |
| | | | | | [11.4] Validate Wiki attachments are valid temporary files See merge request gitlab/gitlabhq!2569 | ||||
* | Merge branch 'security-11-4-junit-test-report-exposes-stacktrace' into ↵ | Jan Provaznik | 2018-10-24 | 1 | -4/+4 |
| | | | | | | | 'security-11-4' [11.4] JUnit test reports endpoint exposes full stack trace in production mode See merge request gitlab/gitlabhq!2517 | ||||
* | Merge branch 'security-if-51113-hash_tokens-11-4' into 'security-11-4' | Jan Provaznik | 2018-10-24 | 20 | -70/+700 |
| | | | | | [11.4] Persist only SHA digest of PersonalAccessToken#token See merge request gitlab/gitlabhq!2551 | ||||
* | Update VERSION to 11.4.1v11.4.1 | GitLab Release Tools Bot | 2018-10-23 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 11.4.1 | GitLab Release Tools Bot | 2018-10-23 | 3 | -10/+8 |
| | | | [ci skip] | ||||
* | Merge branch 'security-11-4-51527-xss-in-mr-source-branch' into 'security-11-4' | Thiago Presa | 2018-10-22 | 3 | -9/+17 |
| | | | | | [11.4] Fix XSS in MR source branch name See merge request gitlab/gitlabhq!2550 | ||||
* | Merge branch 'sh-block-other-localhost-11-4' into 'security-11-4' | Thiago Presa | 2018-10-22 | 3 | -0/+37 |
| | | | | | [11.4] Prevent SSRF attacks in HipChat integration See merge request gitlab/gitlabhq!2547 | ||||
* | Update VERSION to 11.4.0v11.4.0 | GitLab Release Tools Bot | 2018-10-19 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 11.4.0 | GitLab Release Tools Bot | 2018-10-19 | 202 | -1017/+225 |
| | | | [ci skip] | ||||
* | Update VERSION to 11.4.0-rc8v11.4.0-rc8 | GitLab Release Tools Bot | 2018-10-18 | 1 | -1/+1 |
| | |||||
* | Merge branch '11-4-stable-prepare-rc8' into '11-4-stable' | Thiago Presa | 2018-10-18 | 6 | -1/+147 |
|\ | | | | | | | | | Prepare 11.4 RC8 release See merge request gitlab-org/gitlab-ce!22452 | ||||
| * | Merge branch 'add/git-protocol-v2-docs' into 'master' | Evan Read | 2018-10-18 | 2 | -0/+98 |
| | | | | | | | | | | Add Git protocol v2 docs See merge request gitlab-org/gitlab-ce!22227 | ||||
| * | Merge branch 'ml-qa-code-owners' into 'master' | Rémy Coutable | 2018-10-18 | 4 | -1/+49 |
|/ | | | | | QA: Add support for pushing and viewing files See merge request gitlab-org/gitlab-ce!21911 | ||||
* | Update VERSION to 11.4.0-rc7v11.4.0-rc7 | GitLab Release Tools Bot | 2018-10-17 | 1 | -1/+1 |
| | |||||
* | Merge branch '11-4-stable-prepare-rc7' into '11-4-stable' | Steve Azzopardi | 2018-10-17 | 20 | -53/+123 |
|\ | | | | | | | | | Prepare 11.4 RC7 release See merge request gitlab-org/gitlab-ce!22392 | ||||
| * | Merge branch 'docs/fix-link-to-when-delayed' into 'master' | Achilleas Pipinellis | 2018-10-16 | 3 | -2/+2 |
| | | | | | | | | | | Fix link to 'when delayed' YAML configuration item See merge request gitlab-org/gitlab-ce!22349 | ||||
| * | Merge branch ↵ | Clement Ho | 2018-10-16 | 4 | -32/+6 |
| | | | | | | | | | | | | | | | | | | | | '52532-unable-to-toggle-issuable-sidebar-out-of-collapsed-state' into 'master' Allow Issue and Merge Request sidebar to be toggled from collapsed state Closes #52532 See merge request gitlab-org/gitlab-ce!22353 | ||||
| * | Merge branch '52669-fixes-quick-actions-preview' into 'master' | Douglas Barbosa Alexandre | 2018-10-16 | 4 | -2/+16 |
| | | | | | | | | | | | | | | Fixes close/reopen quick actions preview for issues and merge_requests Closes #52669 See merge request gitlab-org/gitlab-ce!22343 | ||||
| * | Merge branch ↵ | Phil Hughes | 2018-10-16 | 6 | -15/+72 |
| | | | | | | | | | | | | | | | | | | '52564-personal-projects-pagination-in-profile-overview-tab-is-broken' into 'master' Resolve "Personal projects pagination in Profile Overview tab is broken" Closes #52564 See merge request gitlab-org/gitlab-ce!22321 | ||||
| * | Merge branch '52614-bugs-on-deployment-status-in-job-log-page' into 'master' | Grzegorz Bizon | 2018-10-16 | 2 | -1/+26 |
| | | | | | | | | | | | | | | Send deployment_status when job starts environment Closes #52614 See merge request gitlab-org/gitlab-ce!22354 | ||||
| * | Merge branch 'gitaly-0.125.1' into 'master' | James Lopez | 2018-10-16 | 1 | -1/+1 |
|/ | | | | | Use Gitaly 0.125.1 See merge request gitlab-org/gitlab-ce!22364 | ||||
* | Update VERSION to 11.4.0-rc6v11.4.0-rc6 | GitLab Release Tools Bot | 2018-10-15 | 1 | -1/+1 |
| | |||||
* | Fixed syntax issues in specs11-4-stable-prepare-rc6 | Jan Provaznik | 2018-10-15 | 4 | -6/+4 |
| | |||||
* | Fixes conflicts for app/assets/javascripts/jobs/components/stages_dropdown.vue | Filipa Lacerda | 2018-10-15 | 1 | -39/+5 |
| | |||||
* | Fixes conflicts for app/assets/javascripts/jobs/components/sidebar.vue | Filipa Lacerda | 2018-10-15 | 1 | -33/+1 |
| | |||||
* | Merge branch '52608-sidebar' into 'master' | Tim Zallmann | 2018-10-15 | 5 | -5/+49 |
| | | | | | | | Hide job sidebar on mobile Closes #52608 See merge request gitlab-org/gitlab-ce!22314 | ||||
* | Merge branch '52618-incorrect-stage-being-shown-in-side-bar-of-job-view-api' ↵ | Tim Zallmann | 2018-10-15 | 13 | -34/+128 |
| | | | | | | | | | | into 'master' Add stage name in job.json response Closes #52618 See merge request gitlab-org/gitlab-ce!22317 | ||||
* | Merge branch '52614-update-job-started-check' into 'master' | Tim Zallmann | 2018-10-15 | 4 | -9/+14 |
| | | | | | Updates the check for started in job header See merge request gitlab-org/gitlab-ce!22329 | ||||
* | Merge branch 'docs-go1.10' into 'master' | Marcia Ramos | 2018-10-15 | 1 | -2/+2 |
| | | | | | | | Drop support for Go 1.9 in GitLab 11.4 Closes #51982 See merge request gitlab-org/gitlab-ce!22324 | ||||
* | Merge branch 'jr-merge-file-tree-docs' into 'master' | Marcia Ramos | 2018-10-15 | 2 | -3/+3 |
| | | | | | Update merge request diff navigation docs See merge request gitlab-org/gitlab-ce!22275 | ||||
* | Merge branch '52361-fix-file-tree-mobile' into 'master' | Filipa Lacerda | 2018-10-15 | 5 | -4/+34 |
| | | | | | | | Resolve "Make file browser hidden by default for mobile screens" and improve layout in small screens too Closes #52361 See merge request gitlab-org/gitlab-ce!22273 | ||||
* | Merge branch 'ce-7921-fix-batch-comments-resolution' into 'master' | Phil Hughes | 2018-10-15 | 1 | -1/+13 |
| | | | | | Backport CE changes for: Resolves "Reviews: Resolving or unresolving discussions with “Add comment now” does not work" See merge request gitlab-org/gitlab-ce!22303 | ||||
* | Update VERSION to 11.4.0-rc5v11.4.0-rc5 | Steve Azzopardi | 2018-10-12 | 1 | -1/+1 |
| | |||||
* | Update VERSION to 11.4.0-rc4v11.4.0-rc411-4-stable-prepare-rc5 | Thiago Presa | 2018-10-11 | 1 | -1/+1 |
| | |||||
* | Merge branch 'gt-remove-duplicate-button-from-the-md-header-toolbar' into ↵11-4-stable-prepare-rc4 | Clement Ho | 2018-10-11 | 2 | -2/+6 |
| | | | | | | | 'master' Remove duplicate button from the markdown header toolbar See merge request gitlab-org/gitlab-ce!22192 | ||||
* | Merge branch 'gt-update-application-copy-secret-to-clipboard-data' into 'master' | Annabel Dunstone Gray | 2018-10-11 | 3 | -2/+7 |
| | | | | | | | Update copy to clipboard button data for application secret Closes #52572 See merge request gitlab-org/gitlab-ce!22268 | ||||
* | Merge branch ↵ | Clement Ho | 2018-10-11 | 1 | -1/+1 |
| | | | | | | | | | '52103-dropzone-css-is-failing-to-load-on-rspec-dev-and-staging-11-4-0-rc' into 'master' Resolve "Dropzone css is failing to load on rspec, dev and staging 11.4.0 RC" Closes #52103 See merge request gitlab-org/gitlab-ce!22272 | ||||
* | Merge branch 'ml-qa-register-user-failure' into 'master' | Rémy Coutable | 2018-10-11 | 4 | -23/+41 |
| | | | | | QA: Retry registration before failing See merge request gitlab-org/gitlab-ce!22033 |