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
AgeCommit message (Collapse)Author
2017-09-01Merge branch 'bvl-validate-po-files' into 'master'Douwe Maan
Validate PO files in static analysis See merge request !13000
2017-09-01Merge branch '36061-mr-ref-instrument' into 'master'Sean McGivern
Instrument MergeRequest#fetch_ref See merge request !13980
2017-09-01Instrument MergeRequest#fetch_refJarka Kadlecova
2017-08-31`current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern
The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
2017-08-31Ignore fuzzy translationsBob Van Landuyt
2017-08-31Merge branch 'mk-default-ldap-verify-certificates-secure' into 'master'Douwe Maan
Default LDAP config verify_certificates to true Closes #33662 See merge request !13915
2017-08-30Default LDAP config verify_certificates to trueMichael Kozono
2017-08-29Update Prometheus Client MMAP gem to version that fixes performance ↵Pawel Chojnacki
degradation caused by workers churn
2017-08-28Instrument MergeRequest#ensure_ref_fetchedJarka Kadlecova
2017-08-24Define ldap methods at runtimeBob Van Landuyt
This avoids loading the `OmniAuthCallbacksController` at boot time so it doesn't mess up the `before_action`-chain
2017-08-22Update form to properly set the pathZeger-Jan van de Weg
Also includes a change in allowing uploaded files, as there was a mismatch in object_id between classes, disallowing params[:file], which is a UploadedFile, newly loaded. The params checked against the older version. Fixes gitlab-org/gitlab-ce#36519
2017-08-18Setup repositories settings properlyMichael Kozono
2017-08-18Setup LDAP settings properlyMichael Kozono
2017-08-16Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher
Only create commit GPG signature when necessary See merge request !13561
2017-08-16Only create commit GPG signature when necessaryDouwe Maan
2017-08-16Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'Rémy Coutable
Circuitbreaker settings to avoid spec-failures Closes #36324 See merge request !13519
2017-08-16Allow a `failure_wait_time` of 0 for storage accessBob Van Landuyt
This allows testing every storage attempt after a failure. Which could be useful for tests
2017-08-16Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable
Whitelist or fix additional `Gitlab/PublicSend` cop violations See merge request !13467
2017-08-16Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable
Enable Layout/TrailingWhitespace cop and auto-correct offenses See merge request !13573
2017-08-15Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher
2017-08-15Make sure MySQL would not use CURRENT_TIMESTAMPLin Jen-Shin
for timestamp columns magically. See: https://gitlab.com/gitlab-org/gitlab-ce/issues/36405
2017-08-14Whitelist or fix additional `Gitlab/PublicSend` cop violationsRobert Speicher
An upcoming update to rubocop-gitlab-security added additional violations.
2017-08-09Enable the Layout/SpaceBeforeBlockBraces copRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-08Re-enable SqlInjection and CommandInjectionBrian Neel
2017-08-08Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
2017-08-07Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira
2017-08-07Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki
2017-08-04Move hostname to Gitlab::EnvironmentBob Van Landuyt
2017-08-04Add a Circuitbreaker for storage pathsBob Van Landuyt
2017-07-28Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵Rémy Coutable
Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-28Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan
Backport some recent changes related to LDAP from EE See merge request !13119
2017-07-28Add remote IP, user ID and username to JSON lograge outputStan Hu
This makes the logs a bit more useful to search requests by users.
2017-07-27Merge branch 'backport-ee-2456' into 'master'Robert Speicher
Skip OAuth authorization for trusted applications See merge request !13061
2017-07-27Merge branch 'remove_custom_devise_failure_app' into 'master'Robert Speicher
Remove GitLab custom failure app for Devise See merge request !13136
2017-07-27Backport gitlab-ee!2456Oswaldo Ferreira
2017-07-27Merge branch 'feature/gpg-signed-commits' into 'master'Dmitriy Zaporozhets
GPG signed commits Closes #20268 See merge request !9546
2017-07-27Remove GitLab custom fealure app for deviseValery Sizov
2017-07-27Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into ↵Douwe Maan
'master' Ensure test files are deleted after fs metrics gathering run Closes #35457 See merge request !13080
2017-07-27use Module#prepend instead of alias_method_chainAlexis Reigel
2017-07-27mysql hack: set length for binary indexesAlexis Reigel
2017-07-27Backport some recent changes related to LDAP from EERubén Dávila
2017-07-27Support custom directory in gitlab:backup:create taskMarkus Koller
2017-07-27Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern
Resolve "Add CSRF token verification to API" Closes #33601 See merge request !12154
2017-07-26Add warning about certificate verification on loadMichael Kozono
2017-07-26Move backwards compatibility logic out of the codeMichael Kozono
And closer to the configuration setup. The code doesn’t need to know about this.
2017-07-26Add LDAP config optionsMichael Kozono
2017-07-26Add `rescue false`.blackst0ne
2017-07-26Refactor CSRF protectionblackst0ne
2017-07-25Ensure test files are deleted after testsPawel Chojnacki
2017-07-25Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'Sean McGivern
Adds link_to_gfm method instrumentation See merge request !13069