Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update VERSION to 11.4.6v11.4.611-4-stable-patch-7 | GitLab Release Tools Bot | 2018-11-18 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 11.4.6 | GitLab Release Tools Bot | 2018-11-18 | 2 | -5/+7 |
| | | | [ci skip] | ||||
* | Merge branch 'sh-fix-issue-54189-11-4' into 'security-11-4' | Steve Azzopardi | 2018-11-18 | 4 | -1/+37 |
| | | | | | [11.4] Prevent templated services from being imported See merge request gitlab/gitlabhq!2636 | ||||
* | Merge branch 'security-11-4-2717-xss-username-autocomplete' into 'security-11-4' | Steve Azzopardi | 2018-11-18 | 3 | -11/+40 |
| | | | | | [11.4] Escape user fullname while rendering autocomplete template to prevent XSS See merge request gitlab/gitlabhq!2607 | ||||
* | Update VERSION to 11.4.5v11.4.5 | GitLab Release Tools Bot | 2018-11-04 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 11.4.5 | GitLab Release Tools Bot | 2018-11-04 | 6 | -24/+14 |
| | | | [ci skip] | ||||
* | Merge branch '11-4-stable-patch-5' into 11-4-stable | Thiago Presa | 2018-11-04 | 15 | -28/+44 |
|\ | |||||
| * | Update gitlab-ui dependency to 1.8.0-hotfix.111-4-stable-patch-5 | Clement Ho | 2018-11-02 | 3 | -5/+10 |
| | | |||||
| * | Fix stage dropdown rendering only in English | Filipa Lacerda | 2018-11-02 | 7 | -10/+13 |
| | | | | | | | | | | | | The default value of the selected stage was a translated string. This commit removes the string and uses a flag property instead. The stage dropdown is now only rendered after the stages endpoint is received. | ||||
| * | Remove duplicate escape in job sidebar | Filipa Lacerda | 2018-11-02 | 3 | -5/+8 |
| | | |||||
| * | Merge branch 'docs/download-2fa-codes' into 'master' | Achilleas Pipinellis | 2018-11-01 | 1 | -5/+7 |
| | | | | | | | | | | Documentation: Add mention that recovery codes are downloadable. See merge request gitlab-org/gitlab-ce!22483 | ||||
| * | Merge branch 'docs/highlight-mentions' into 'master' | Marcia Ramos | 2018-11-01 | 1 | -3/+6 |
| | | | | | | | | | | Document highlighted mentions See merge request gitlab-org/gitlab-ce!22488 | ||||
* | | Merge branch '11-4-stable-patch-5' into 11-4-stable | Thiago Presa | 2018-11-04 | 5 | -2/+20 |
|\ \ | |/ | |||||
| * | Merge branch '53070-fix-usage-ping-link' into 'master' | Stan Hu | 2018-10-31 | 2 | -1/+6 |
| | | | | | | | | | | | | | | Fix usage ping link Closes #53070 See merge request gitlab-org/gitlab-ce!22545 | ||||
| * | Merge branch 'mr-file-tree-inline-fluid-width-fix' into 'master' | Filipa Lacerda | 2018-10-31 | 3 | -1/+14 |
| | | | | | | | | | | | | | | Fixed merge request fill tree not respecting fluid width Closes #52916 See merge request gitlab-org/gitlab-ce!22487 | ||||
* | | 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 |
| |