summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Load the "New Branch" button asynchronouslyYorick Peterse2016-04-281-0/+1
| | | | | | | 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.
* Merge branch 'allow-disabling-of-rack-attack' into 'master' Rémy Coutable2016-04-282-2/+5
|\ | | | | | | | | | | | | 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
| * Disable Rack Attack if admin disables it in config fileStan Hu2016-04-272-2/+5
| | | | | | | | | | Grack::Auth already checks this variable. These holdouts were not disabled, leading to confusion when debugging a customer issue.
* | Merge branch 'admin-email-frequency' into 'master' Jacob Vosmaer2016-04-282-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Send 'admin emails' weekly, not dailyJacob Vosmaer2016-04-262-3/+3
| | | | | | | | | | | | Daily seems to be to spammy, so let's default to weekly instead.
* | | Merge branch 'fix-github-enterprise-imports' into 'master' Rémy Coutable2016-04-282-0/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fixes for review of GitHub Enterprise backport changesStan Hu2016-04-261-3/+3
| | | |
| * | | Backport GitHub Enterprise import support from EEStan Hu2016-04-262-0/+26
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'rs-letter_opener_web' into 'master' Dmitriy Zaporozhets2016-04-272-5/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 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
| * | Add letter_opener_web gemrs-letter_opener_webRobert Speicher2016-04-222-5/+7
| |/ | | | | | | | | | | 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.
* | Remove the Devise Async gem.Connor Shea2016-04-261-1/+0
|/ | | | | | The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration. Resolves #15575.
* Improved confirmation UXconfirmation-screenPhil Hughes2016-04-211-0/+1
| | | | Closes #4228
* Instrument Gitlab::GitAccess/GitAccessWikiYorick Peterse2016-04-211-0/+4
|
* Switch raw trace to use X-Sendfile headerTomasz Maczukin2016-04-191-1/+1
|
* Add raw trace output for GitLab WorkhorseTomasz Maczukin2016-04-191-0/+1
|
* Add support to cherry-pick any commitP.S.V.R2016-04-181-0/+1
| | | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
* Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master' Rémy Coutable2016-04-151-1/+1
|\ | | | | | | | | | | | | Make /profile/keys/new redirects to /profile/keys for back-compat This addresses https://github.com/gitlabhq/gitlabhq/issues/10138. See merge request !3717
| * Make /profile/keys/new redirects to /profile/keys for back-compatRémy Coutable2016-04-151-1/+1
| | | | | | | | | | | | Report: https://github.com/gitlabhq/gitlabhq/issues/10138 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'auto-fsck' into 'master' Robert Speicher2016-04-143-1/+15
|\ \ | |/ |/| | | | | | | | | Auto git fsck Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 See merge request !3232
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-134-0/+28
| |\
| * | Clear repository check columns asynchronouslyJacob Vosmaer2016-04-131-1/+1
| | |
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-128-9/+50
| |\ \
| * | | Move 'clear checks' button to applicatoin settingsJacob Vosmaer2016-04-121-4/+1
| | | |
| * | | Rename almost all the thingsJacob Vosmaer2016-04-063-6/+6
| | | |
| * | | Rebase repo check MRJacob Vosmaer2016-04-043-1/+18
| | | |
* | | | Merge branch 'redis_config_consistency' into 'master' Valery Sizov2016-04-132-5/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redis configuration consistency Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e See merge request !3697
| * | | | Redis configuration consistencyredis_config_consistencyValery Sizov2016-04-132-5/+3
| | | | |
* | | | | Merge branch 'async-related-mrs' into 'master' Rémy Coutable2016-04-131-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Load related MRs/branches asynchronously cc @dzaporozhets See merge request !3678
| * | | | Load related MRs/branches asynchronouslyYorick Peterse2016-04-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski2016-04-132-0/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Documentation of featurePatricio Cano2016-04-111-0/+7
| | | | |
| * | | | Allow `external_providers` for Omniauth to be defined to mark these users as ↵Patricio Cano2016-04-111-0/+1
| | | | | | | | | | | | | | | | | | | | external
* | | | | Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-132-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663
| * | | | | Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-122-0/+6
| | |/ / / | |/| | | | | | | | | | | | | Closes #15105
* | | | | Add changelog entries, install docs, and gitlab.yml.example entry for the ↵DJ Mountney2016-04-121-0/+9
| | | | | | | | | | | | | | | | | | | | trusted_proxies setting
* | | | | Adjust the default trusted_proxies to only include localhost, and allow ↵DJ Mountney2016-04-122-0/+3
| | | | | | | | | | | | | | | | | | | | other trusted proxies to be configured.
* | | | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-121-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Simplify Projects::NotificationSettingsControllerDouglas Barbosa Alexandre2016-04-121-1/+1
| | | | |
| * | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-117-10/+13
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Use singular resource for NotificationSettingDouglas Barbosa Alexandre2016-04-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Since a user cannot have multiple NotificationSettings records for one group/project we can use singular resource.
| * | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-085-9/+14
| |\ \ \ \
| * | | | | Change how notification settings in profile are rendered and updatedDmitriy Zaporozhets2016-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Create NotificationSettings object only when user change value in dropdownDmitriy Zaporozhets2016-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'instrument-service-classes' into 'master' Rémy Coutable2016-04-121-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument all service classes This will help us see where (mostly) Sidekiq code is spending time. See merge request !3675
| * | | | | | Instrument all service classesinstrument-service-classesYorick Peterse2016-04-121-0/+12
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#15162
* | | | | | Un-instrument Banzai::ReferenceExtractoruninstrument-banzai-reference-extractorYorick Peterse2016-04-121-3/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Instrument Banzai codeYorick Peterse2016-04-111-0/+23
| |_|/ / |/| | |
* | | | Enable asset compression in production.connorshea2016-04-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | `config.assets.compress` needed to be explicitly enabled. Follow-up to !3544. Resolves #14344.
* | | | Merge branch 'rs-update-rails' into 'master' Robert Speicher2016-04-091-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump rails to 4.2.6 See merge request !3424
| * | | | Bump rails to 4.2.6rs-update-railsRobert Speicher2016-04-051-0/+1
| | | | |
View Lorry Controller Status