summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 10.0.6v10.0.6Lin Jen-Shin2017-11-081-1/+1
|
* Update CHANGELOG.md for 10.0.6Lin Jen-Shin2017-11-081-0/+4
| | | [ci skip]
* Merge branch 'security-10-0-36099-api-responses-missing-x-content' into ↵Douwe Maan2017-11-073-1/+15
| | | | | | | | | | | 'security-10-0' (backport) Include X-Content-Type-Options (XCTO) header into API responses See merge request gitlab/gitlabhq!2215 (cherry picked from commit 2f295a11ca2f0790c5a95f1f97f049b15609f045) a99ef1c6 Include X-Content-Type-Options (XCTO) header into API responses
* Merge branch 'ssrf-protections-round-2-10-0' into 'security-10-0'Douwe Maan2017-11-072-1/+19
| | | | | | | | | Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions (10-0) See merge request gitlab/gitlabhq!2220 (cherry picked from commit be1198563d39779e002530e070a3e18cfeacacaa) 0e21fb35 Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions
* Update VERSION to 10.0.5v10.0.5Jarka Kadlecova2017-11-031-1/+1
|
* Update CHANGELOG.md for 10.0.5Jarka Kadlecova2017-11-0316-76/+18
| | | [ci skip]
* Merge branch '10-0-stable-patch-5' into '10-0-stable'Jarka Kadlecova2017-11-0371-274/+894
|\ | | | | | | | | Prepare 10.0.5 release See merge request gitlab-org/gitlab-ce!14935
| * Fix spec for Projects::UpdateService10-0-stable-patch-5Douglas Barbosa Alexandre2017-11-011-1/+1
| |
| * Fix spec for Projects::CreateServiceDouglas Barbosa Alexandre2017-11-011-2/+2
| |
| * Try to fix conflict resolutionJarka Kadlecova2017-11-012-14/+2
| |
| * fix wrongly resolved conflictJarka Kadlecova2017-11-011-1/+0
| |
| * Merge branch '38202-cannot-rename-a-hashed-project' into 'master'Nick Thomas2017-11-014-31/+103
| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot rename a hashed project" Closes #38202 See merge request gitlab-org/gitlab-ce!14428 # Conflicts: # app/models/project.rb # spec/services/projects/create_service_spec.rb # spec/services/projects/update_service_spec.rb
| * Merge branch ↵Stan Hu2017-11-012-3/+3
| | | | | | | | | | | | | | 'pawel/bump_prometheus_gem_to_fix_read_all_values_returning_bad_data-39504' into 'master' Update Prometheus Gem to fix problem caused by using wrong data offsets See merge request gitlab-org/gitlab-ce!15081
| * Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan2017-11-014-3/+21
| | | | | | | | | | | | | | | | | | | | Remove "boards" from TOP_LEVEL_ROUTES Closes #39073 See merge request gitlab-org/gitlab-ce!14861 # Conflicts: # config/routes.rb
| * Merge branch 'backport-ee-2869' into 'master'Sean McGivern2017-11-013-17/+35
| | | | | | | | | | | | | | | | backport for gitlab-ee!2869 See merge request gitlab-org/gitlab-ce!14505 # Conflicts: # spec/features/boards/sidebar_spec.rb
| * Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ↵Stan Hu2017-11-012-3/+3
| | | | | | | | | | | | | | | | | | into 'master' Update Prometheus gem to fix problems with other Processes overwriting current metrics file Closes #36714 See merge request gitlab-org/gitlab-ce!14827
| * Merge branch 'capture-rev-list-errors' into 'master'Sean McGivern2017-11-011-1/+1
| | | | | | | | | | Include RevList error messages in exceptions See merge request gitlab-org/gitlab-ce!14658
| * Merge branch '37229-mr-widget-status-icon' into 'master'Jacob Schatz2017-11-013-19/+89
| | | | | | | | | | | | | | | | | | | | improve merge request widget status icon UX Closes #37229 See merge request gitlab-org/gitlab-ce!14200 # Conflicts: # app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
| * Merge branch '38641-repo-editor-callout' into 'master'Jacob Schatz2017-11-011-1/+1
| | | | | | | | | | Removes auto devops callout from repo editor view See merge request gitlab-org/gitlab-ce!14616
| * Merge branch 'acet-disabled-comment-textarea-while-requesting' into 'master'Filipa Lacerda2017-11-012-0/+41
| | | | | | | | | | | | | | Disable comment textarea while submitting a new comment. Closes #37858 See merge request gitlab-org/gitlab-ce!14541
| * Merge branch '38187-38315-fix-dropdown-open-top-bottom-spacing' into 'master'Annabel Dunstone Gray2017-11-017-3/+14
| | | | | | | | | | | | | | Fix bottom spacing for dropdowns that open upwards Closes #38187 and #38315 See merge request gitlab-org/gitlab-ce!14535
| * Merge branch 'mr-widget-merged-date-tooltip' into 'master'Filipa Lacerda2017-11-016-22/+70
| | | | | | | | | | | | | | Fixes merge request widget date tooltip inconsistencies Closes #38545 See merge request gitlab-org/gitlab-ce!14578
| * Merge branch 'bvl-dont-rename-free-names' into 'master'Douwe Maan2017-11-012-11/+5
| | | | | | | | | | | | | | Don't rename groups/projects that aren't reserved anymore Closes #39387 See merge request gitlab-org/gitlab-ce!15029
| * Merge branch 'fix-application-setting-nil-cache' into 'master'Winnie Hellmann2017-11-014-2/+25
| | | | | | | | | | | | | | Prevent ApplicationSetting to cache nil value Closes #39275 See merge request gitlab-org/gitlab-ce!14952
| * Merge branch 'sh-api-json-logs' into 'master'Achilleas Pipinellis2017-11-011-2/+22
| | | | | | | | | | Add docs for `api_json.log` file See merge request gitlab-org/gitlab-ce!14950
| * Merge branch '37691-subscription-fires-multiple-notifications' into 'master'Sean McGivern2017-11-014-8/+25
| | | | | | | | | | | | | | fix multiple notifications from being sent for multiple labels Closes #37691 See merge request gitlab-org/gitlab-ce!14798
| * Merge branch 'acet-fix-paste-on-comment-form' into 'master'Filipa Lacerda2017-11-011-1/+4
| | | | | | | | | | | | | | Trigger change event of the markdown textarea to allow Vue catch the programmatic changes. Closes #38441 See merge request gitlab-org/gitlab-ce!14539
| * Merge branch 'fix/import-issue-assignees' into 'master'Sean McGivern2017-11-017-1/+27
| | | | | | | | | | | | | | Fix missing issue assignees Closes #39170 See merge request gitlab-org/gitlab-ce!15109
| * Merge branch '35580-cannot-import-project-with-milestones' into 'master'Sean McGivern2017-11-016-98/+333
| | | | | | | | | | | | | | fix the import :milestone from adding the group_id Closes #35580 See merge request gitlab-org/gitlab-ce!14657
| * Merge branch '38197-fix-ImapAuthenticationCheck' into 'master'Douwe Maan2017-11-012-17/+33
| | | | | | | | | | | | | | Fix `rake gitlab:incoming_email:check` Closes #38197 See merge request gitlab-org/gitlab-ce!14423
| * Merge branch 'sh-fix-gitlab-qa-ee-license-add' into 'master'Grzegorz Bizon2017-11-012-4/+1
| | | | | | | | | | Fix GitLab QA: increase window size to ensure License link shows See merge request gitlab-org/gitlab-ce!14674
| * Merge branch 'group-milestones-breadcrumb' into 'master'Tim Zallmann2017-11-012-1/+7
| | | | | | | | | | | | | | Fixes group milestones breadcrumb links Closes #38781 See merge request gitlab-org/gitlab-ce!14689
| * Merge branch '38789-prometheus-graphs-occasionally-have-incorrect-y-scale' ↵Tim Zallmann2017-11-012-1/+6
| | | | | | | | | | | | | | | | | | into 'master' Resolve "Prometheus graphs occasionally have incorrect Y scale" Closes #38789 See merge request gitlab-org/gitlab-ce!14693
| * Merge branch ↵Tim Zallmann2017-11-016-14/+27
| | | | | | | | | | | | | | | | | | '37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsistent' into 'master' Resolve "Monitoring graph axes labels are inaccurate and inconsistent" Closes #37105 See merge request gitlab-org/gitlab-ce!14258
* | Merge branch '10-0-breadcrumb-item-links' into '10-0-stable'Jarka Kadlecova2017-11-015-8/+17
|\ \ | |/ |/| | | | | Stable port of breadcrumb-item-links See merge request gitlab-org/gitlab-ce!14623
| * spec fixes10-0-breadcrumb-item-linksPhil Hughes2017-11-011-2/+2
| |
| * Stable port of breadcrumb-item-linksTim Zallmann2017-11-014-6/+15
|/
* Update VERSION to 10.0.4v10.0.4Jarka Kadlecova2017-10-161-1/+1
|
* Update CHANGELOG.md for 10.0.4Jarka Kadlecova2017-10-164-15/+6
| | | [ci skip]
* Remove redundant specRobert Speicher2017-10-111-6/+0
|
* Merge branch 'port-ee-3435' into 'security-10-0'Robert Speicher2017-10-114-31/+11
| | | | | [10.0 CE] Prevent "Related Issues" from leaking confidential issues See merge request gitlab/gitlabhq!2193
* Merge branch '38126-security-username-change' into 'security-10-0'Douwe Maan2017-10-114-13/+50
| | | | | Move project repositories between namespaces when renaming users (10.0) See merge request gitlab/gitlabhq!2200
* Merge branch 'winh-search-bar-xss' into 'security-10-0'Phil Hughes2017-10-112-2/+25
| | | | | Escape user name in filtered search bar See merge request gitlab/gitlabhq!2194
* Merge branch 'rs-sanitize-unicode-in-protocol' into 'security-10-0'Douwe Maan2017-10-113-2/+22
| | | | | [10.0] Prevent a persistent XSS in user-provided markup See merge request gitlab/gitlabhq!2199
* Merge branch 'fix-arbitrary-redirect-vulnerability' into 'security-10-0'Robert Speicher2017-10-113-10/+15
| | | | | Fix arbitrary redirect location vulnerability See merge request gitlab/gitlabhq!2192
* Merge branch 'rs-qa-default-password' into 'master'Grzegorz Bizon2017-10-102-4/+39
| | | | | | | | Use the default password from the GDK's root user Closes gitlab-qa#73 See merge request gitlab-org/gitlab-ce!14701
* Update VERSION to 10.0.3v10.0.3Jarka Kadlecova2017-10-051-1/+1
|
* Update CHANGELOG.md for 10.0.3Jarka Kadlecova2017-10-0515-70/+17
| | | [ci skip]
* Merge branch '10-0-stable-patch-3' into '10-0-stable'Jarka Kadlecova2017-10-0429-57/+216
|\ | | | | | | | | Prepare 10.0.3 release See merge request gitlab-org/gitlab-ce!14590
| * Merge branch 'fix-kubectl-180' into 'master'10-0-stable-patch-3Kamil Trzciński2017-10-034-3/+8
| | | | | | | | | | | | | | Fix broken certificate-authority-data with kubectl >= 1.8.0 Closes #38685 See merge request gitlab-org/gitlab-ce!14635
View Lorry Controller Status