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-10-03Add grpc.log for GitalyJacob Vosmaer (GitLab)
2017-10-03Merge branch 'close-issue-by-implements' into 'master'Sean McGivern
Add "implements" to the default issue closing message regex Closes #38424 See merge request gitlab-org/gitlab-ce!14612
2017-10-02Add "implements" to the default issue closing message regexGuilherme Vieira
2017-10-01Add `:email_confirmation` to devise `insensitive_keys`robdel12
This fixes a bug where the email confirmation input value is case sensative. For example, if the email input is `myemail@example.com` and the email confirmation input is `Myemail@example.com` the form would fail to submit.
2017-09-24Remove Grit settings from default settingsStan Hu
This is a follow-up to https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1956 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7308.
2017-09-19Merge branch 'fix-rails-migrations-for-partial-indexes' into 'master'Yorick Peterse
Fix regular expression used for opclasses to not be confused by partial index clause See merge request gitlab-org/gitlab-ce!14343
2017-09-19Detect n+1 issues involving GitalyAndrew Newdigate
2017-09-19Fix regular expression used for opclasses to not be confused by partial ↵Greg Stark
index clause
2017-09-18Merge branch '37789-followup-for-read-registry-change' into 'master'Rémy Coutable
Clean up read_registry scope changes Closes #37789 See merge request gitlab-org/gitlab-ce!14307
2017-09-18Clean up read_registry scope changesRobin Bobbitt
Closes #37789
2017-09-15Never connect to webpack-dev-server over SSLAlessio Caiazza
2017-09-11Revert "Merge branch 'revert-f2421b2b' into 'master'"Annabel Dunstone Gray
This reverts merge request !14148
2017-09-09Read import sources from setting at first initializationVisay Keo
2017-09-08Revert "Merge branch ↵Rubén Dávila
'35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
2017-09-07Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
zj/gitlab-ce-zj-auto-devops-table
2017-09-06Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski
zj/gitlab-ce-zj-auto-devops-table
2017-09-06Restore some changes from !9199Rubén Dávila
2017-09-06Merge branch ↵Douwe Maan
'34509-improves-markdown-rendering-performance-for-commits-list' into 'master' Resolve "Projects::CommitsController#show is slow partially due to SQL queries" Closes #34509 See merge request !13762
2017-09-06Adds cacheless render to Banzai object renderTiago Botelho
2017-09-06Profile updates from providersAlexander Keramidas
2017-09-04Incorporate reviewZeger-Jan van de Weg
2017-09-04Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg
2017-09-04Fix testsZeger-Jan van de Weg
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-31Implement the implied CI/CD config for AutoDevOpsZeger-Jan van de Weg
Behind an application setting, which defaults to false, this commit implements the implied CI/CD config. Which means that in the case we can't find the `.gitlab-ci.yml` on the commit we want to start a pipeline for, we fall back to an implied configuration. For now the Bash template has been copied to `Auto-Devops.gitlab-ci.yml` so the tests actually work. Fixes #34777
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