Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
AgeCommit message (Collapse)Author
2017-11-10Merge branch 'issue_39773_be' into 'master'Sean McGivern
Prevent fast forward merge when rebase is required Closes #39773 See merge request gitlab-org/gitlab-ce!15296
2017-11-10Merge branch 'dm-block-group-and-project-creation-when-external-by-default' ↵Sean McGivern
into 'master' Make sure group and project creation is blocked for new users that are external by default Closes #39664 See merge request gitlab-org/gitlab-ce!15212
2017-11-10Merge branch 'fix/import-export-arguments' into 'master'Douwe Maan
Fix arguments error on Import/Export fetch_ref method Closes #39541 See merge request gitlab-org/gitlab-ce!15241
2017-11-10Merge branch '10-1-jivl-fix-cancel-button-file-upload-new-issue' into ↵Lin Jen-Shin
10-1-stable-patch-2 * 10-1-jivl-fix-cancel-button-file-upload-new-issue: Merge branch 'jivl-fix-cancel-button-file-upload-new-issue' into 'master'
2017-11-10Merge branch '10-1-stable' into 10-1-stable-patch-2Lin Jen-Shin
* 10-1-stable: Update VERSION to 10.1.2 Update CHANGELOG.md for 10.1.2 Merge branch 'fix-mysql-grant-check' into 'master' Merge branch '36099-api-responses-missing-x-content-type-options-header' into '10-1-stable' Merge branch 'ssrf-protections-round-2' into 'security-10-1'
2017-11-07Merge branch 'fix-mysql-grant-check' into 'master'Rémy Coutable
Fix TRIGGER checks for MySQL Closes #38372 See merge request gitlab-org/gitlab-ce!15226 (cherry picked from commit d45fef88f7f0aa249893f9f151185eac5b9bb870)
2017-11-07Merge branch '36099-api-responses-missing-x-content-type-options-header' ↵Douwe Maan
into '10-1-stable' Include X-Content-Type-Options (XCTO) header into API responses See merge request gitlab/gitlabhq!2211 (cherry picked from commit 6c818e77f2abeef2dd7b17a269611b018701fa79) e087e075 Include X-Content-Type-Options (XCTO) header into API responses
2017-11-07Merge branch 'ssrf-protections-round-2' into 'security-10-1'Douwe Maan
Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions See merge request gitlab/gitlabhq!2219 (cherry picked from commit 4a1e73783d5480aa514db7b53e10c075f95580b5) 1bffa0c3 Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions
2017-11-06Merge branch 'pawel/disable_nfs_metrics_checks_39730' into 'master'Stan Hu
Remove Filesystem check metrics that use too much CPU to handle requests See merge request gitlab-org/gitlab-ce!15158
2017-11-06Merge branch 'bvl-unlink-fixes' into 'master'Douwe Maan
This fixes some bugs related to forked projects of which the source was deleted. Closes #39667 See merge request gitlab-org/gitlab-ce!15150
2017-11-06Merge branch 'issue_39176' into 'master'Douwe Maan
Render 404 when polling commit notes without having permissions Closes #39176 See merge request gitlab-org/gitlab-ce!15140
2017-11-06Merge branch 'sh-fix-environment-slug-generation' into 'master'Grzegorz Bizon
Avoid regenerating the ref path for the environment Closes #39752 See merge request gitlab-org/gitlab-ce!15167
2017-11-06Merge branch 'fix_diff_parsing' into 'master'Sean McGivern
Fix diff parser so it tolerates to diff special markers in the content Closes #34431 See merge request gitlab-org/gitlab-ce!14848
2017-11-06Merge branch 'gl-username-hook-fix' into 'master'Douwe Maan
Fix the incorrect value being used to set GL_USERNAME on hooks See merge request gitlab-org/gitlab-ce!15038
2017-11-06Merge branch 'jivl-fix-cancel-button-file-upload-new-issue' into 'master'Filipa Lacerda
Fix cancel button not working when uploading a file on the new issue page Closes #39512 See merge request gitlab-org/gitlab-ce!15137
2017-10-31Merge branch 'dm-ldap-identity-normalize-dn' into 'master'Sean McGivern
Normalize LDAP DN when looking up identity Closes #39559 See merge request gitlab-org/gitlab-ce!15103
2017-10-31Merge branch 'fix/import-issue-assignees' into 'master'Sean McGivern
Fix missing issue assignees Closes #39170 See merge request gitlab-org/gitlab-ce!15109
2017-10-30Merge branch 'make-merge-jid-handling-less-stateful' into 'master'Sean McGivern
Fix widget of locked merge requests not being presented See merge request gitlab-org/gitlab-ce!15069
2017-10-30Merge branch 'bvl-circuitbreaker-backoff' into 'master'Sean McGivern
Circuitbreaker backoff and retries Closes #37383 and #38231 See merge request gitlab-org/gitlab-ce!14933
2017-10-30Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan
Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842
2017-10-30Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'Sean McGivern
Use the correct project visibility in system hooks Closes #39496 See merge request gitlab-org/gitlab-ce!15065
2017-10-30Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable
Avoid using `Redis#keys` See merge request gitlab-org/gitlab-ce!14889
2017-10-30Merge branch '39366-email-confirmation-fails' into 'master'Douwe Maan
grab the correct username when confirming secondary email Closes #39366 See merge request gitlab-org/gitlab-ce!15010
2017-10-28Merge branch '39188-change-default-disabled-merge-message' into 'master'Filipa Lacerda
Change default disabled merge request widget message to be more general Closes #39188 See merge request gitlab-org/gitlab-ce!14960 (cherry picked from commit e9d352612371424592376b81d0a6c5ca234b9fb5) b7835587 Change default disabled merge request widget message to "Merge is not allowed yet"
2017-10-28Merge branch 'ac-k8s-namespace-validator' into 'master'Rémy Coutable
Sanitize k8s default_namespace Closes #38692 See merge request gitlab-org/gitlab-ce!15053 (cherry picked from commit 172ebcb8bb9c0b4d3c565560880fc604cae02b5e) a1b3cd40 namespace should be lowercased in kubernetes. This is also true for the scenario… 6798bab1 Remove duped tests 3aafcc16 Add KubernetesService#default_namespace tests
2017-10-28Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'Sean McGivern
Add path attribute to WikiFile class Closes #39420 See merge request gitlab-org/gitlab-ce!15019 (cherry picked from commit 98c57e9a9f73409a912189064a7adf0431768b3a) 76becfb5 Add path attribute to WikiFile class
2017-10-28Merge branch '39441-bring-edit-form-back' into 'master'Rémy Coutable
Revert "Merge branch '36670-remove-edit-form' into 'master'" Closes #39441 See merge request gitlab-org/gitlab-ce!15049 (cherry picked from commit fa3b4736604c8785ee5dba595f1f003751e15c59) 17b43670 Revert "Merge branch '36670-remove-edit-form' into 'master'"
2017-10-24Merge branch 'sh-fix-environment-write-ref' into 'master'Grzegorz Bizon
Fix the writing of invalid environment refs Closes #39182 See merge request gitlab-org/gitlab-ce!14993 (cherry picked from commit 3dcdd4a1e8533cac55805d2242446cb2e12b21e9) 3bff85a4 Fix the writing of invalid environment refs
2017-10-24Merge branch 'bvl-fix-push-event-service-for-forks' into 'master'Douwe Maan
Only cache the push event for the fork-source when it exists Closes #39352 See merge request gitlab-org/gitlab-ce!14989 (cherry picked from commit 08a8a3f963ff4ca5392abc66eb6fdae5d6d1e118) 6f5ebc4b Only cache the event for the fork-source when it exists
2017-10-21Merge branch '39189-online-view-of-html-artifacts-is-broken' into 'master'Grzegorz Bizon
Resolve "Online view of HTML artifacts is broken?" Closes #39189 See merge request gitlab-org/gitlab-ce!14977 (cherry picked from commit cfd97f7ebedec56ccf979e21997dfa19e0807205) 3c0be3cd Fix the external URLs generated for online view of HTML artifacts
2017-10-20Merge branch 'fix-application-setting-nil-cache' into 'master'Winnie Hellmann
Prevent ApplicationSetting to cache nil value Closes #39275 See merge request gitlab-org/gitlab-ce!14952 (cherry picked from commit 81175d2c37d7bb9768ee21b13207ef57d11ad3ea) 64fd9814 Prevent ApplicationSetting to cache nil value beeed14f Fix failure in current_settings_spec.rb
2017-10-20Merge branch '10-1-stable-prepare-rc4' into '10-1-stable'Winnie Hellmann
Prepare 10.1 RC4 release See merge request gitlab-org/gitlab-ce!14953
2017-10-20Merge branch 'tc-page-title-encoding-fix' into 'master'Winnie Hellmann
URI decode Page-Title header to preserve UTF-8 characters Closes #39179 (cherry-picked from 85c201603ab856fbe5129aa231ab069ffd73d769) See merge request gitlab-org/gitlab-ce!14929
2017-10-20Merge branch 'fix-non-diff-resolved-discussion' into 'master'Phil Hughes
Force non diff resolved discussion to display when collapse toggled Closes #39187 See merge request gitlab-org/gitlab-ce!14946 (cherry picked from commit 9c3f094a2f7609386ed182e4d5f6f9e7f6938388) 9487cadf Force non diff resolved discussion to display when collapse toggled 1c4f42a4 Add spec f6304f16 Add changelog
2017-10-19Merge branch 'encoding-helper-performance' into 'master'Rémy Coutable
Avoind unnecesary `force_encoding` operations Closes #39227 See merge request gitlab-org/gitlab-ce!12167 (cherry picked from commit 371eb62bc90a70f4a578303215e1d4dfc430ddbb) 520866a0 Avoind unnecesary `force_encoding` operations
2017-10-18Merge branch '39253-jobs-fail-because-of-brazilian-portuguese-translations' ↵Rémy Coutable
into 'master' Resolve "Jobs fail because of Brazilian Portuguese translations" Closes #39253 See merge request gitlab-org/gitlab-ce!14939 (cherry picked from commit 9c71fb0de2f0a7482b1a59c673142981ecdab26f) 0139b318 Prevent ApplicationHelper specs from polluting later ones
2017-10-18Merge branch 'bvl-fix-locale-path' into 'master'Tim Zallmann
Render region codes for locale assets with an `_` instead of a `-` Closes #39225 See merge request gitlab-org/gitlab-ce!14924 (cherry picked from commit 4733570c3d710f3124718fa1173f3068eb932281) 939469cd Build the locale path with an `_` instead of a `-`
2017-10-18Merge branch 'fix-resolved-side-by-side' into 'master'Phil Hughes
Fix resolved discussions not expanding on side by side view Closes #39209 See merge request gitlab-org/gitlab-ce!14918 (cherry picked from commit acadf527117d759b6b8ca27245a8d85d01f77bc2) f8cf00fd Fix resolved discussions not expanding on side by side view 07c81f23 Add specs 3581c6db Improve spec
2017-10-18Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'Grzegorz Bizon
Add short_revision and use total_size Closes #39203 See merge request gitlab-org/gitlab-ce!14917 (cherry picked from commit 0fa2f14857ceb5b5b52595555bb2c3e6e930e1f7) 5ee58c1c Add short_revision and use total_size 6d2338c7 Fix failed test 6ac0a69b Fix broken test
2017-10-18Merge branch 'bvl-fix-deleting-forked-projects' into 'master'Douwe Maan
Fix errors when deleting a forked project Closes #39196 See merge request gitlab-org/gitlab-ce!14916 (cherry picked from commit 85d8ab52ca27c5bcd9036aa81a9f0ace9794ee0d) 2c0b6776 Fix errors when deleting a forked project
2017-10-18Merge branch 'prevent-creating-multiple-application-settings' into 'master'Yorick Peterse
Prevent creating multiple ApplicationSetting by forcing it to always have id=1 Closes #34728 See merge request gitlab-org/gitlab-ce!14718 (cherry picked from commit 65a1cbc600cf36ff5db9644072e4bf1e2b8e5cde) c909b6aa Prevent creating multiple ApplicationSetting by forcing it to always have id=1
2017-10-18Merge branch ↵Rémy Coutable
'39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclass' into 'master' Resolve "Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits::Error: #<NoMethodError: undefined method `map' for nil:NilClass" Closes #39181 See merge request gitlab-org/gitlab-ce!14907 (cherry picked from commit 526c47618e446bfec776b6e17462298f17fb24ee) 9245bfc2 Handle null serialised commits in background migration
2017-10-18Merge branch 'an/popen-deadline' into 'master'Sean McGivern
Popen with a timeout See merge request gitlab-org/gitlab-ce!14872 (cherry picked from commit 8aa6e7ef030a9e7522c533c7e177a618f37265ec) b88e8aae Popen with a timeout f09a7b3c Linter fixes
2017-10-18Merge branch ↵Kamil Trzciński
'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master' Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count` Closes #38960 See merge request gitlab-org/gitlab-ce!14807 (cherry picked from commit 076231798dd9716479d8eef118678eeb7c2c7b11) a6b2387d Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead…
2017-10-16Those tests were tested under authenticatedLin Jen-Shin
On master, so we should move them under authenticated.
2017-10-16Fix bad merge with spec/models/namespace_spec.rbStan Hu
2017-10-16Merge branch 'port-ee-3435' into 'security-10-0'Robert Speicher
[10.0 CE] Prevent "Related Issues" from leaking confidential issues See merge request gitlab/gitlabhq!2193
2017-10-16Merge branch '38126-security-username-change' into 'security-10-0'Douwe Maan
Move project repositories between namespaces when renaming users (10.0) See merge request gitlab/gitlabhq!2200
2017-10-16Merge branch 'rs-sanitize-unicode-in-protocol' into 'security-10-0'Douwe Maan
[10.0] Prevent a persistent XSS in user-provided markup See merge request gitlab/gitlabhq!2199
2017-10-16Merge branch 'winh-search-bar-xss' into 'security-10-0'Phil Hughes
Escape user name in filtered search bar See merge request gitlab/gitlabhq!2194