summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.4.6v11.4.611-4-stable-patch-7GitLab Release Tools Bot2018-11-181-1/+1
|
* Update CHANGELOG.md for 11.4.6GitLab Release Tools Bot2018-11-182-5/+7
| | | [ci skip]
* Merge branch 'sh-fix-issue-54189-11-4' into 'security-11-4'Steve Azzopardi2018-11-184-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 Azzopardi2018-11-183-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.5GitLab Release Tools Bot2018-11-041-1/+1
|
* Update CHANGELOG.md for 11.4.5GitLab Release Tools Bot2018-11-046-24/+14
| | | [ci skip]
* Merge branch '11-4-stable-patch-5' into 11-4-stableThiago Presa2018-11-0415-28/+44
|\
| * Update gitlab-ui dependency to 1.8.0-hotfix.111-4-stable-patch-5Clement Ho2018-11-023-5/+10
| |
| * Fix stage dropdown rendering only in EnglishFilipa Lacerda2018-11-027-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 sidebarFilipa Lacerda2018-11-023-5/+8
| |
| * Merge branch 'docs/download-2fa-codes' into 'master'Achilleas Pipinellis2018-11-011-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 Ramos2018-11-011-3/+6
| | | | | | | | | | Document highlighted mentions See merge request gitlab-org/gitlab-ce!22488
* | Merge branch '11-4-stable-patch-5' into 11-4-stableThiago Presa2018-11-045-2/+20
|\ \ | |/
| * Merge branch '53070-fix-usage-ping-link' into 'master'Stan Hu2018-10-312-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 Lacerda2018-10-313-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.4GitLab Release Tools Bot2018-10-301-1/+1
| |
* | Update CHANGELOG.md for 11.4.4GitLab Release Tools Bot2018-10-302-5/+7
| | | | | | [ci skip]
* | Merge branch 'security-kubeclient-ssrf-11-4' into 'security-11-4'Jan Provaznik2018-10-302-0/+26
|/ | | | | [11.4] Security kubeclient ssrf See merge request gitlab/gitlabhq!2573
* Update VERSION to 11.4.3v11.4.3GitLab Release Tools Bot2018-10-261-1/+1
|
* Update CHANGELOG.md for 11.4.3GitLab Release Tools Bot2018-10-261-0/+4
| | | [ci skip]
* Merge branch 'fix_pat_auth-11-4' into 'security-11-4'Robert Speicher2018-10-263-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.2GitLab Release Tools Bot2018-10-251-1/+1
|
* Update CHANGELOG.md for 11.4.2GitLab Release Tools Bot2018-10-256-25/+11
| | | [ci skip]
* Merge branch 'sh-block-other-localhost' into 'master'Thiago Presa2018-10-243-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 Provaznik2018-10-243-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 Provaznik2018-10-2411-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 Provaznik2018-10-244-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 Presa2018-10-244-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 Provaznik2018-10-241-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 Provaznik2018-10-2420-70/+700
| | | | | [11.4] Persist only SHA digest of PersonalAccessToken#token See merge request gitlab/gitlabhq!2551
* Update VERSION to 11.4.1v11.4.1GitLab Release Tools Bot2018-10-231-1/+1
|
* Update CHANGELOG.md for 11.4.1GitLab Release Tools Bot2018-10-233-10/+8
| | | [ci skip]
* Merge branch 'security-11-4-51527-xss-in-mr-source-branch' into 'security-11-4'Thiago Presa2018-10-223-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 Presa2018-10-223-0/+37
| | | | | [11.4] Prevent SSRF attacks in HipChat integration See merge request gitlab/gitlabhq!2547
* Update VERSION to 11.4.0v11.4.0GitLab Release Tools Bot2018-10-191-1/+1
|
* Update CHANGELOG.md for 11.4.0GitLab Release Tools Bot2018-10-19202-1017/+225
| | | [ci skip]
* Update VERSION to 11.4.0-rc8v11.4.0-rc8GitLab Release Tools Bot2018-10-181-1/+1
|
* Merge branch '11-4-stable-prepare-rc8' into '11-4-stable'Thiago Presa2018-10-186-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 Read2018-10-182-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 Coutable2018-10-184-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-rc7GitLab Release Tools Bot2018-10-171-1/+1
|
* Merge branch '11-4-stable-prepare-rc7' into '11-4-stable'Steve Azzopardi2018-10-1720-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 Pipinellis2018-10-163-2/+2
| | | | | | | | | | Fix link to 'when delayed' YAML configuration item See merge request gitlab-org/gitlab-ce!22349
| * Merge branch ↵Clement Ho2018-10-164-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 Alexandre2018-10-164-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 Hughes2018-10-166-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 Bizon2018-10-162-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 Lopez2018-10-161-1/+1
|/ | | | | Use Gitaly 0.125.1 See merge request gitlab-org/gitlab-ce!22364
* Update VERSION to 11.4.0-rc6v11.4.0-rc6GitLab Release Tools Bot2018-10-151-1/+1
|
* Fixed syntax issues in specs11-4-stable-prepare-rc6Jan Provaznik2018-10-154-6/+4
|