summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 11.3.1v11.3.1GitLab Release Tools Bot2018-09-261-1/+1
|
* Update CHANGELOG.md for 11.3.1GitLab Release Tools Bot2018-09-267-30/+12
| | | [ci skip]
* Merge branch 'security-fj-stored-xss-in-repository-imports-11-3' into ↵Bob Van Landuyt2018-09-255-2/+80
| | | | | | | 'security-11-3' [11.3] Stored XSS in Gitlab Merge Request from imported repository See merge request gitlab/gitlabhq!2500
* Merge branch 'security-package-json-xss-11-3' into 'security-11-3'Bob Van Landuyt2018-09-253-5/+24
| | | | | [11.3] Fix XSS vulnerability sourced from package.json's homepage See merge request gitlab/gitlabhq!2508
* Merge branch 'fix-events-finder-incomplete-11-3' into 'security-11-3'Bob Van Landuyt2018-09-247-4/+231
| | | | | [11.3] Redact events shown in the events API See merge request gitlab/gitlabhq!2518
* Merge branch 'zj-gitaly-sec-11-3' into 'security-11-3'Bob Van Landuyt2018-09-241-1/+1
| | | | | Upstream Gitaly version bump See merge request gitlab/gitlabhq!2515
* Merge branch 'sh-sh-block-other-localhost-11-3' into 'security-11-3'Bob Van Landuyt2018-09-243-1/+33
| | | | | Block loopback addresses in UrlBlocker (11.3 port) See merge request gitlab/gitlabhq!2521
* Merge branch ↵Bob Van Landuyt2018-09-2420-44/+161
| | | | | | | 'security-11-3-6881-project-group-approvers-leaks-private-group-info-ce' into 'security-11-3' [11.3] CE: Project group approvers leaks private group info See merge request gitlab/gitlabhq!2525
* Merge branch 'security-11-3-gcp-token-exposed-by-kubernetes' into ↵Bob Van Landuyt2018-09-244-9/+9
| | | | | | | 'security-11-3' [11.3] - Do not persist errors from Kubernetes calls See merge request gitlab/gitlabhq!2503
* Merge branch 'security-acet-issue-details-11-3' into 'security-11-3'Bob Van Landuyt2018-09-245-4/+47
| | | | | [11.3] Fix XSS on Issue details page. See merge request gitlab/gitlabhq!2495
* Merge branch 'security-2697-code-highlight-timeout-11-3' into 'security-11-3'Bob Van Landuyt2018-09-243-1/+35
| | | | | [11.3] Fix syntax highlight taking too long See merge request gitlab/gitlabhq!2524
* Update VERSION to 11.3.0v11.3.0GitLab Release Tools Bot2018-09-211-1/+1
|
* Update CHANGELOG.md for 11.3.0GitLab Release Tools Bot2018-09-21224-1124/+247
| | | [ci skip]
* Update VERSION to 11.3.0-rc11v11.3.0-rc11GitLab Release Tools Bot2018-09-191-1/+1
|
* Merge branch '41729-enable-auto-devops-instance-wide-for-everyone' into 'master'11-3-stable-prepare-rc11Kamil Trzciński2018-09-1911-103/+173
| | | | | | | Resolve "Enable Auto DevOps by default for self managed instances of GitLab" Closes #41729 See merge request gitlab-org/gitlab-ce!21157
* Update VERSION to 11.3.0-rc10v11.3.0-rc10GitLab Release Tools Bot2018-09-181-1/+1
|
* Merge branch ↵11-3-stable-prepare-rc10Douwe Maan2018-09-185-4/+15
| | | | | | | | | '50944-unable-to-import-repository-undefined-method-import_file-for-nil-nilclass' into 'master' Resolve "Unable to import repository: undefined method `import_file' for nil:NilClass" Closes #50944 See merge request gitlab-org/gitlab-ce!21765
* Merge branch '50956-web-terminal' into 'master'Phil Hughes2018-09-182-1/+6
| | | | | | | Include correct CSS file for xterm in environments page Closes #50956 See merge request gitlab-org/gitlab-ce!21768
* Update VERSION to 11.3.0-rc9v11.3.0-rc9GitLab Release Tools Bot2018-09-171-1/+1
|
* Merge branch 'mr-fixed-expanded-state-not-working' into 'master'11-3-stable-prepare-rc9Mike Greiling2018-09-173-7/+41
| | | | | | | Fixed resolved discussions not toggling expanded on changes tab Closes #51370 See merge request gitlab-org/gitlab-ce!21676
* Merge branch '51412-username-alignment-issue-on-mr-page' into 'master'Annabel Dunstone Gray2018-09-173-2/+8
| | | | | | | Resolve "Username alignment issue on MR page" Closes #51412 See merge request gitlab-org/gitlab-ce!21697
* Merge branch 'update-gitlab-shell-8-3-3' into 'master'Stan Hu2018-09-172-1/+6
| | | | | Update GitLab Shell to v8.3.3 See merge request gitlab-org/gitlab-ce!21750
* Update VERSION to 11.3.0-rc8v11.3.0-rc8Bob Van Landuyt2018-09-131-1/+1
|
* Merge branch 'bjk/49849_node_metrics_update' into 'master'Stan Hu2018-09-131-4/+4
| | | | | | | Update example Prometheus queries Closes #49849 See merge request gitlab-org/gitlab-ce!21695
* Merge branch ↵Stan Hu2018-09-132-9/+11
| | | | | | | | | '51271-error-500-due-to-encoding-issues-when-when-attempting-to-access-issues-api' into 'master' Resolve "Error 500 due to encoding issues when when attempting to access issues API" Closes #51271 See merge request gitlab-org/gitlab-ce!21680
* Merge branch '51200-markdown-footnotes-don-t-render-when-inside-a-table' ↵Douwe Maan2018-09-132-1/+18
| | | | | | | | | into 'master' Resolve "Markdown footnotes don't render when inside a table..." Closes #51200 See merge request gitlab-org/gitlab-ce!21675
* Merge branch 'update-gitlab-shell' into 'master'Stan Hu2018-09-132-1/+6
| | | | | Update gitlab shell See merge request gitlab-org/gitlab-ce!21701
* Merge branch '7573-show-click-to-expand-on-not-rendered-diffs' into 'master'Phil Hughes2018-09-133-1/+19
| | | | | | | Display click to expand on collapsed diffs Closes #51466 See merge request gitlab-org/gitlab-ce!21716
* Merge branch 'use-bootstrap-4.1.1' into 'master'Mike Greiling2018-09-132-4/+8
| | | | | | | Explicitly use bootstrap 4.1.1 Closes #51362 See merge request gitlab-org/gitlab-ce!21683
* Update VERSION to 11.3.0-rc7v11.3.0-rc7GitLab Release Tools Bot2018-09-111-1/+1
|
* Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master'11-3-stable-prepare-rc7Grzegorz Bizon2018-09-115-12/+38
| | | | | | | Resolve "Project export broken when avatar is set" Closes #51318 See merge request gitlab-org/gitlab-ce!21649
* Merge branch 'fix-namespace-upload' into 'master'Kamil Trzciński2018-09-113-0/+15
| | | | | | | Fix workhorse temp path for namespace uploads Closes gitlab-ee#7009 See merge request gitlab-org/gitlab-ce!21650
* Merge branch '51375-fix-activity-pages' into 'master'Robert Speicher2018-09-112-1/+36
| | | | | | | Fix the group and project activity pages Closes #51375 See merge request gitlab-org/gitlab-ce!21674
* Update VERSION to 11.3.0-rc6v11.3.0-rc6GitLab Release Tools Bot2018-09-111-1/+1
|
* Merge branch 'sh-fix-ee-issue-7543' into 'master'Bob Van Landuyt2018-09-111-10/+18
| | | | | | | Add stub methods for FakeApplicationSetting Closes gitlab-ee#7543 See merge request gitlab-org/gitlab-ce!21662
* Merge branch '51268-clear-in-memory-application-settings-between-examples' ↵Robert Speicher2018-09-103-0/+12
| | | | | | | | | into 'master' Resolve "Changes in in-memory application settings in one spec can break another spec" Closes #51268 See merge request gitlab-org/gitlab-ce!21638
* Merge branch 'qa-fix-specs-runner-when-args-given' into 'master'Rémy Coutable2018-09-102-21/+46
| | | | | [QA] Fix arguments passed to RSpec::Core::Runner See merge request gitlab-org/gitlab-ce!21578
* Merge branch ↵Achilleas Pipinellis2018-09-101-5/+1
| | | | | | | | | 'docs/51295-update-documentation-for-interactive-web-terminals-to-remove-beta-indicator' into 'master' Remove beta from web terminal documentation Closes #51295 See merge request gitlab-org/gitlab-ce!21641
* Merge branch 'sh-bump-gitlab-shell-8.3.1' into 'master'Bob Van Landuyt2018-09-101-1/+1
| | | | | Bump gitlab-shell to 8.3.1 See merge request gitlab-org/gitlab-ce!21648
* Merge branch '21371-changelog' into 'master'Rémy Coutable2018-09-101-0/+5
| | | | | Add changelog to !21371 See merge request gitlab-org/gitlab-ce!21615
* Merge branch 'bvl-move-import-common-metrics-migration' into 'master'Kamil Trzciński2018-09-101-0/+2
| | | | | | | Reset column information before running CommonMetricsImporter Closes #51305 See merge request gitlab-org/gitlab-ce!21647
* Update VERSION to 11.3.0-rc5v11.3.0-rc5GitLab Release Tools Bot2018-09-101-1/+1
|
* Merge branch 'sh-fix-ldap-qa' into 'master'Rémy Coutable2018-09-101-1/+1
| | | | | Fix LDAP QA specs failing due to button change See merge request gitlab-org/gitlab-ce!21622
* Merge branch 'dks-update-templates-licenses-11-3' into 'master'Bob Van Landuyt2018-09-1019-563/+93
| | | | | Update templates and licenses for 11.3 See merge request gitlab-org/gitlab-ce!21611
* Merge branch 'master' into 11-3-stable-prepare-rc5Bob Van Landuyt2018-09-10614-4772/+10194
|\
| * Merge branch '51281-on-master-diff-view-contains-extra-and-signs' into 'master'Phil Hughes2018-09-103-4/+19
| |\ | | | | | | | | | | | | | | | | | | Resolve "On master, inline diff view contains extra `+` and `-` signs" Closes #51281 See merge request gitlab-org/gitlab-ce!21634
| | * Resolve "On master, inline diff view contains extra `+` and `-` signs"Tim Zallmann2018-09-103-4/+19
| |/
| * Merge branch 'sidekiq-query' into 'master'Rémy Coutable2018-09-101-0/+20
| |\ | | | | | | | | | | | | Disable query limit counter in sidekiq See merge request gitlab-org/gitlab-ce!21470
| | * Disable query limit counter in sidekiqJan Provaznik2018-09-041-0/+20
| | | | | | | | | | | | | | | Inside Sidekiq the request is whitelisted to avoid increasing query counter.
| * | Merge branch 'api-promote-find-branch' into 'master'Rémy Coutable2018-09-104-11/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | API: Use find_branch! in all places Closes #51250 See merge request gitlab-org/gitlab-ce!21614
View Lorry Controller Status