summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add 10.1.2 security fixes to CHANGELOG.mdmk-add-security-fixes-to-changelog-10-1-stableMichael Kozono2017-11-091-0/+2
|
* Update VERSION to 10.1.2v10.1.2Lin Jen-Shin2017-11-081-1/+1
|
* Update CHANGELOG.md for 10.1.2Lin Jen-Shin2017-11-082-5/+4
| | | [ci skip]
* Merge branch 'fix-mysql-grant-check' into 'master'Rémy Coutable2017-11-073-28/+29
| | | | | | | | | | Fix TRIGGER checks for MySQL Closes #38372 See merge request gitlab-org/gitlab-ce!15226 (cherry picked from commit d45fef88f7f0aa249893f9f151185eac5b9bb870)
* Merge branch '36099-api-responses-missing-x-content-type-options-header' ↵Douwe Maan2017-11-073-1/+15
| | | | | | | | | | | 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
* Merge branch 'ssrf-protections-round-2' into 'security-10-1'Douwe Maan2017-11-072-1/+19
| | | | | | | | | 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
* Update VERSION to 10.1.1v10.1.1Winnie Hellmann2017-10-311-1/+1
|
* Update CHANGELOG.md for 10.1.1Winnie Hellmann2017-10-3122-107/+24
| | | [ci skip]
* Merge branch 'dm-ldap-identity-normalize-dn' into 'master'Sean McGivern2017-11-019-12/+35
| | | | | | | Normalize LDAP DN when looking up identity Closes #39559 See merge request gitlab-org/gitlab-ce!15103
* 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 'acet-fix-paste-on-comment-form' into 'master'Filipa Lacerda2017-10-311-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_global_board_routes_39073' into 'master'Douwe Maan2017-10-314-16/+20
| | | | | | | Remove "boards" from TOP_LEVEL_ROUTES Closes #39073 See merge request gitlab-org/gitlab-ce!14861
* Merge branch '39639-clusters-poll' into 'master'Phil Hughes2017-10-312-8/+19
| | | | | | | Adds callback function to initial cluster request Closes #39639 See merge request gitlab-org/gitlab-ce!15105
* Merge branch ↵Stan Hu2017-10-302-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 '39426-update-fog-google-docs' into 'master'Achilleas Pipinellis2017-10-301-33/+90
| | | | | Add docs for backing up to Google Cloud Storage See merge request gitlab-org/gitlab-ce!15074
* Merge branch ↵Yorick Peterse2017-10-302-1/+6
| | | | | | | | | '39054-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Resolve "ActiveRecord::StatementInvalid: PG::QueryCanceled: ERROR: canceling statement due to statement timeout" Closes #39054 See merge request gitlab-org/gitlab-ce!15063
* Merge branch 'make-merge-jid-handling-less-stateful' into 'master'Sean McGivern2017-10-307-59/+31
| | | | | | Fix widget of locked merge requests not being presented See merge request gitlab-org/gitlab-ce!15069
* Merge branch 'bvl-circuitbreaker-patch' into '10-1-stable'Lin Jen-Shin (godfat)2017-10-3027-306/+470
|\ | | | | | | | | Circuitbreaker stable patch See merge request gitlab-org/gitlab-ce!15079
| * Merge branch 'bvl-circuitbreaker-backoff' into 'master'Sean McGivern2017-10-3019-196/+275
| | | | | | | | | | | | | | | | Circuitbreaker backoff and retries Closes #37383 and #38231 See merge request gitlab-org/gitlab-ce!14933
| * Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-3021-127/+212
|/ | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842
* Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'Sean McGivern2017-10-303-1/+12
| | | | | | | Use the correct project visibility in system hooks Closes #39496 See merge request gitlab-org/gitlab-ce!15065
* Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-306-36/+33
| | | | | Avoid using `Redis#keys` See merge request gitlab-org/gitlab-ce!14889
* Merge branch '39366-email-confirmation-fails' into 'master'Douwe Maan2017-10-304-1/+16
| | | | | | | grab the correct username when confirming secondary email Closes #39366 See merge request gitlab-org/gitlab-ce!15010
* Merge branch '10-1-stable-patch-1' into '10-1-stable'Lin Jen-Shin (godfat)2017-10-3041-99/+423
|\ | | | | | | | | Prepare 10.1.1 release See merge request gitlab-org/gitlab-ce!15027
| * Merge remote-tracking branch 'upstream/10-1-stable' into 10-1-stable-patch-110-1-stable-patch-1Lin Jen-Shin2017-10-302-1/+6
| |\ | |/ |/| | | | | * upstream/10-1-stable: Update gitaly in Gitlab 10.1 to 0.43.1
* | Merge branch 'an/update-gitaly-10-1' into '10-1-stable'Lin Jen-Shin (godfat)2017-10-272-1/+6
|\ \ | | | | | | | | | | | | Update gitaly in Gitlab 10.1 to 0.43.1 See merge request gitlab-org/gitlab-ce!15055
| * | Update gitaly in Gitlab 10.1 to 0.43.1Andrew Newdigate2017-10-272-1/+6
|/ /
| * Merge branch 'docs/update-create-mr' into 'master'Marcia Ramos2017-10-284-13/+10
| | | | | | | | | | | | | | | | | | Update docs on creating MRs See merge request gitlab-org/gitlab-ce!14982 (cherry picked from commit 1aae91cf24606275834d6e17279ce14c1074dade) 8bb17358 Update docs on creating MRs
| * Merge branch '39188-change-default-disabled-merge-message' into 'master'Filipa Lacerda2017-10-283-2/+54
| | | | | | | | | | | | | | | | | | | | | | 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"
| * Merge branch 'ac-k8s-namespace-validator' into 'master'Rémy Coutable2017-10-283-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'patch-29' into 'master'Sean McGivern2017-10-281-1/+0
| | | | | | | | | | | | | | | | | | Semi-linear history merge is now available in CE. See merge request gitlab-org/gitlab-ce!15059 (cherry picked from commit 284a94522fa3359b87f8b1c867d3416515ee8365) be73ede3 Semi-linear history merge is now available in CE.
| * Merge branch 'sh-api-json-logs' into 'master'Achilleas Pipinellis2017-10-281-2/+22
| | | | | | | | | | | | | | | | | | Add docs for `api_json.log` file See merge request gitlab-org/gitlab-ce!14950 (cherry picked from commit 16998e2e13a83a07be9d78f210e7f629e7330dd4) f452da7c Add docs for `api_json.log` file
| * Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'Sean McGivern2017-10-283-4/+14
| | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '39441-bring-edit-form-back' into 'master'Rémy Coutable2017-10-2810-28/+246
| | | | | | | | | | | | | | | | | | | | | | 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'"
| * Merge branch '39495-fix-bitbucket-login' into 'master'Rémy Coutable2017-10-272-0/+9
| | | | | | | | | | | | | | | | | | | | | | Fix bitbucket login Closes #39495 See merge request gitlab-org/gitlab-ce!15051 (cherry picked from commit a1aa4f00c27afdd3faf5a551b24bfe1555533a4d) 7d8eb4dd Fix bitbucket login
| * Merge branch 'bvl-dont-rename-free-names' into 'master'Douwe Maan2017-10-252-11/+5
| | | | | | | | | | | | | | | | | | | | | | Don't rename groups/projects that aren't reserved anymore Closes #39387 See merge request gitlab-org/gitlab-ce!15029 (cherry picked from commit d27039d14b80998f06f9da697693fcc93611c6e3) a280c687 Don't rename groups/projects that aren't reserved anymore
| * Merge branch 'sh-fix-environment-write-ref' into 'master'Grzegorz Bizon2017-10-243-1/+16
| | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'fix-unresolve-btn-jump-color' into 'master'Phil Hughes2017-10-242-2/+5
| | | | | | | | | | | | | | | | | | | | | | Fix code review discussion action buttons Closes #38891 See merge request gitlab-org/gitlab-ce!14801 (cherry picked from commit a811704c115118fff76046c9307224d41901185a) d04a2aef Fix icon color and btn-group alignment of discussion buttons
| * Merge branch 'performance-bar-sql' into 'master'Rémy Coutable2017-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | Remove Sherlock usage from the performance bar Closes #39351 See merge request gitlab-org/gitlab-ce!15000 (cherry picked from commit 057c81b168c2aea0b4277ec748ce59c195032eaf) 189b5c3c Remove Sherlock usage from the performance bar
| * Merge branch 'bvl-fix-push-event-service-for-forks' into 'master'Douwe Maan2017-10-243-3/+7
| | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'sh-fix-container-registry-destroy' into 'master'Filipa Lacerda2017-10-242-4/+7
| | | | | | | | | | | | | | | | | | | | | | Fix deletion of container registry or images returning an error Closes #39354 See merge request gitlab-org/gitlab-ce!14992 (cherry picked from commit 4cc91b4f19204417f05fba50697d40beb6a94e62) 3e81c500 Fix deletion of container registry or images returning an error
| * Merge branch 'docs/ci-disposable-environment' into 'master'Achilleas Pipinellis2017-10-241-0/+2
|/ | | | | | | | | | Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` See merge request gitlab-org/gitlab-ce!14781 (cherry picked from commit 815a32e29172807cd414dc89a6709f401a4af1ac) 3f59f53b Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` a84fd6a0 Copyedit shared/disposable env variables
* Update VERSION to 10.1.0v10.1.0Stan Hu2017-10-211-1/+1
|
* Update CHANGELOG.md for 10.1.0Stan Hu2017-10-21190-947/+192
| | | [ci skip]
* Update VERSION to 10.1.0-rc4v10.1.0-rc4Winnie Hellmann2017-10-211-1/+1
|
* Merge branch '39189-online-view-of-html-artifacts-is-broken' into 'master'Grzegorz Bizon2017-10-213-10/+19
| | | | | | | | | | | 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
* Merge branch 'fix-application-setting-nil-cache' into 'master'Winnie Hellmann2017-10-204-2/+25
| | | | | | | | | | | | 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
* Merge branch '10-1-stable-prepare-rc4' into '10-1-stable'Winnie Hellmann2017-10-2011-19/+61
|\ | | | | | | | | Prepare 10.1 RC4 release See merge request gitlab-org/gitlab-ce!14953
| * Merge branch 'fix-non-diff-resolved-discussion' into 'master'Phil Hughes2017-10-203-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ↵10-1-stable-prepare-rc4Stan Hu2017-10-192-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 (cherry picked from commit f73efb793233f69a0402ba529410bf52c6105c2c) f9a4f184 Update Prometheus gem to fix problems with other files overwriting current file
View Lorry Controller Status