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/config
AgeCommit message (Collapse)Author
2016-05-04Use the new admin settings for gravatarArtem Sidorenko
2016-05-04Merge branch 'add-instrumentation-for-15137' into 'master' Yorick Peterse
Instrument methods used in email diffs See merge request !4038
2016-05-04Instrument methods used in email diffsSean McGivern
Make all of the nested constant instrumentation for core app code work the same way, add mailer instrumentation, and add instrumentation to the premailer gem.
2016-05-04Revert "Remove the Devise Async gem."Connor Shea
This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
2016-05-03Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher
2016-05-02Fix "remember me" sign in optionJacob Vosmaer
2016-04-30Merge branch 'add-parameters' into 'master' Robert Speicher
Add more parameters to the filter_parameters config. Adds Sentry DSN, Webhooks, Deploy Keys, etc. Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences. This also seems to be the more popular syntax for adding new parameters, from what I can find. In the future we may want to [increase the specificity of some of these](http://blog.bigbinary.com/2016/03/07/parameter-filtering-enhacement-rails-5.html) once Rails 5 is out. e.g. instead of `:hook`, `"hook.url"` would be just as effective without removing potentially useful information from the logs. cc: @stanhu See merge request !3971
2016-04-30Add more parameters to the filter_parameters config.Connor Shea
Adds Sentry DSN, Webhooks, Deploy Keys, etc. Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences. This also seems to be the more popular syntax for adding new parameters, from what I can find.
2016-04-29Merge branch 'sentry-filter' into 'master' Robert Speicher
Prevent Rails filtered parameters from leaking to Sentry. As described in their Docs: https://docs.getsentry.com/on-premise/clients/ruby/integrations/rails/ See merge request !3974
2016-04-29Prevent Rails filtered parameters from leaking to Sentry.Connor Shea
As described in their Docs: https://docs.getsentry.com/on-premise/clients/ruby/integrations/rails/
2016-04-28Load the "New Branch" button asynchronouslyYorick Peterse
This button depends on Issue#can_be_worked_on? which in turn depends on Issue#related_branches. By rendering this button asynchronously we can finally remove all usages of Issue#related_branches and Issue#referenced_merge_requests from the issues "show" page.
2016-04-28Merge branch 'allow-disabling-of-rack-attack' into 'master' Rémy Coutable
Disable Rack Attack if admin disables it in config file Grack::Auth already checks this variable. These holdouts were not disabled, leading to confusion when debugging a customer issue. See merge request !3918
2016-04-28Merge branch 'admin-email-frequency' into 'master' Jacob Vosmaer
Send 'admin emails' weekly, not daily Daily seems to be to spammy, so let's default to weekly instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15520 See merge request !3923
2016-04-28Merge branch 'fix-github-enterprise-imports' into 'master' Rémy Coutable
Backport GitHub Enterprise import support from EE These changes were pulled from GitLab EE to support configuring an alternative API URL than the default https://api.github.com. In addition, the `verify_ssl` flag allows users to disable SSL cert checking. One modification: add a default `args` option if it does not exist to avoid breaking existing configurations. See merge request !3892
2016-04-27Disable Rack Attack if admin disables it in config fileStan Hu
Grack::Auth already checks this variable. These holdouts were not disabled, leading to confusion when debugging a customer issue.
2016-04-27Merge branch 'rs-letter_opener_web' into 'master' Dmitriy Zaporozhets
Add letter_opener_web gem Sent emails in the development environment will no longer automatically be opened in the browser. If a sent email needs to be viewed, it can be found at the `/rails/letter_opener` route. See merge request !3893
2016-04-27Fixes for review of GitHub Enterprise backport changesStan Hu
2016-04-27Backport GitHub Enterprise import support from EEStan Hu
These changes were pulled from GitLab EE to support configuring an alternative API URL than the default https://api.github.com. In addition, the `verify_ssl` flag allows users to disable SSL cert checking. One modification: add a default `args` option if it does not exist to avoid breaking existing configurations.
2016-04-26Remove the Devise Async gem.Connor Shea
The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration. Resolves #15575.
2016-04-26Send 'admin emails' weekly, not dailyJacob Vosmaer
Daily seems to be to spammy, so let's default to weekly instead.
2016-04-23Fix issue with impersonationDouwe Maan
2016-04-22Add letter_opener_web gemRobert Speicher
Sent emails in the development environment will no longer automatically be opened in the browser. If a sent email needs to be viewed, it can be found at the `/rails/letter_opener` route.
2016-04-22Improved confirmation UXPhil Hughes
Closes #4228
2016-04-21Instrument Gitlab::GitAccess/GitAccessWikiYorick Peterse
2016-04-20Switch raw trace to use X-Sendfile headerTomasz Maczukin
2016-04-20Add raw trace output for GitLab WorkhorseTomasz Maczukin
2016-04-18Add support to cherry-pick any commitP.S.V.R
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
2016-04-15Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master' Rémy Coutable
Make /profile/keys/new redirects to /profile/keys for back-compat This addresses https://github.com/gitlabhq/gitlabhq/issues/10138. See merge request !3717
2016-04-15Make /profile/keys/new redirects to /profile/keys for back-compatRémy Coutable
Report: https://github.com/gitlabhq/gitlabhq/issues/10138 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-14Merge branch 'auto-fsck' into 'master' Robert Speicher
Auto git fsck Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 See merge request !3232
2016-04-13Merge branch 'redis_config_consistency' into 'master' Valery Sizov
Redis configuration consistency Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e See merge request !3697
2016-04-13Redis configuration consistencyValery Sizov
2016-04-13Merge branch 'async-related-mrs' into 'master' Rémy Coutable
Load related MRs/branches asynchronously cc @dzaporozhets See merge request !3678
2016-04-13Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer
2016-04-13Load related MRs/branches asynchronouslyYorick Peterse
Currently this works by loading the HAML partials via XHR. While this is not the nicest setup it _is_ the easiest setup using the tools we currently have. Loading this data asynchronously doesn't make loading the related MRs/branches itself faster, it merely ensures that loading the issue itself is not slowed down. Fixes gitlab-org/gitlab-ce#14949
2016-04-13Clear repository check columns asynchronouslyJacob Vosmaer
2016-04-13Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski
Allow Omniauth providers to be marked as external Related to #4009 With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login. MR for Omnibus: gitlab-org/omnibus-gitlab!727 /cc @dblessing @DouweM See merge request !3657
2016-04-13Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets
Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663
2016-04-12Add changelog entries, install docs, and gitlab.yml.example entry for the ↵DJ Mountney
trusted_proxies setting
2016-04-12Adjust the default trusted_proxies to only include localhost, and allow ↵DJ Mountney
other trusted proxies to be configured.
2016-04-12Merge branch 'decouple-member-notification' into 'master' Douwe Maan
Decouple membership and notifications This allow you to have notification setting per project even if you are member of group. It also creates background for having notification settings in project you are not member of. - [x] Make it work - [x] Migrations - [x] CHANGELOG - [x] More tests - [x] API For #3359 After this merge request there is still some work to be done: * create migration that remove duplicates in notification settings table and create uniq index (8.8 probably) * remove notification_level field from Member model in 9.0 * make proper API for notification settings * use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) * maybe more tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3421
2016-04-12Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer
2016-04-12Move 'clear checks' button to applicatoin settingsJacob Vosmaer
2016-04-12Move RepositoryArchiveCacheWorker to sidekiq-cronRobert Speicher
Closes #15105
2016-04-12Simplify Projects::NotificationSettingsControllerDouglas Barbosa Alexandre
2016-04-12Merge branch 'instrument-service-classes' into 'master' Rémy Coutable
Instrument all service classes This will help us see where (mostly) Sidekiq code is spending time. See merge request !3675
2016-04-12Un-instrument Banzai::ReferenceExtractorYorick Peterse
Instrumenting this class together with Gitlab::ReferenceExtractor causes a StackError for some reason. Since Gitlab::ReferenceExtractor has most of the interesting code we'll only instrument that class.
2016-04-12Instrument all service classesYorick Peterse
Fixes gitlab-org/gitlab-ce#15162
2016-04-11Instrument Banzai codeYorick Peterse
2016-04-11Documentation of featurePatricio Cano