summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* remove extra space to fix codestylerubocop/space-around-operatorsGabriel Mazetto2016-05-131-1/+1
|
* Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-135-13/+13
|
* Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-122-2/+2
|\ | | | | | | | | | | | | | | | | Enable the Rubocop DeprecatedClassMethods cop This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods. See merge request !4087
| * Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-082-2/+2
| | | | | | | | | | | | This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods.
* | Merge branch 'health-check-route'Douwe Maan2016-05-122-0/+8
|\ \ | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | Support token header for health check token, and general cleanup of the ↵DJ Mountney2016-05-112-2/+2
| | | | | | | | | | | | health_check feature.
| * | Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-101-1/+3
| | | | | | | | | | | | Also added a health check page to the admin section for resetting the token.
| * | Set the standard health_check options to include the cache check.DJ Mountney2016-05-101-28/+3
| | |
| * | Add the health_check gem end expose the health_check routeDJ Mountney2016-05-102-0/+31
| | |
* | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737
| * \ \ Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-102-2/+2
| |\ \ \ | | |/ /
| * | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-0/+1
| | |/ | |/| | | | | | | | | | We send a state of ansi2html to client, client needs to send this state back. The state describes the configuration of generator and position within trace.
* | | Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan2016-05-111-18/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add snippet tab under user profile Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15572 See merge request !4001
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-115-15/+22
| |\ \ \ | | | | | | | | | | | | | | | issue_15572_snippets_tab_under_user_profile
| * | | | Code improveLong Nguyen2016-05-101-7/+8
| | | | |
| * | | | Routing refactoringLong Nguyen2016-05-081-13/+10
| | | | |
| * | | | Fix routing errorLong Nguyen2016-05-081-1/+1
| | | | |
| * | | | user routings refactorLong Nguyen2016-05-081-20/+17
| | | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-0510-31/+95
| |\ \ \ \ | | | |/ / | | |/| | | | | | | issue_15572_snippets_tab_under_user_profile
| * | | | Add snippet tab under user profileLong Nguyen2016-05-021-2/+3
| | | | |
* | | | | Remove Rails monkey-patches now that we're using Rails 4.2.6Rémy Coutable2016-05-111-48/+0
| |_|/ / |/| | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Fix a few places where autoloading would failRémy Coutable2016-05-103-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix naming of API::CommitStatuses - Ensure we use require_dependency instead of require - Ensure the namespace is right in lib/api/api.rb, otherwise, we might require Grape::API::Helpers which defines the `#params` method. This is to avoid requiring a file multiple times and getting an "Already initialized constant" error. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Add eager load paths to help prevent dependency load issues with Sidekiq workersStan Hu2016-05-101-6/+13
| |_|/ |/| | | | | | | | | | | | | | Attempts to address #13521, #14825 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'rs-remove-wall_enabled' into 'master' Dmitriy Zaporozhets2016-05-091-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove `wall_enabled` field from Project See merge request !4089
| * | | Remove `wall_enabled` field from Projectrs-remove-wall_enabledRobert Speicher2016-05-081-1/+0
| | |/ | |/|
* | | Merge branch 'trusted-proxies-ip-addr' into 'master' Rémy Coutable2016-05-091-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Pass trusted_proxies to action_dispatch as IPAddrs instead of strings Without this setting your own trusted_proxies does not work. Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524 Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17004 See merge request !3970
| * | Pass trusted_proxies to action_dispatch as IPAddrs instead of stringsDJ Mountney2016-04-281-1/+2
| | | | | | | | | | | | Without this setting your own trusted_proxies does not work.
* | | Use the new admin settings for gravatarArtem Sidorenko2016-05-041-1/+0
| | |
* | | Merge branch 'add-instrumentation-for-15137' into 'master' Yorick Peterse2016-05-041-15/+22
|\ \ \ | | | | | | | | | | | | | | | | Instrument methods used in email diffs See merge request !4038
| * | | Instrument methods used in email diffsSean McGivern2016-05-041-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Revert "Remove the Devise Async gem."Connor Shea2016-05-031-0/+1
|/ / / | | | | | | | | | | | | | | | This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
* | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-021-3/+3
|\ \ \
| * | | Fix issue with impersonationDouwe Maan2016-04-221-3/+3
| | |/ | |/|
* | | Fix "remember me" sign in optionJacob Vosmaer2016-05-021-1/+1
| | |
* | | Merge branch 'add-parameters' into 'master' Robert Speicher2016-04-301-1/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Add more parameters to the filter_parameters config.Connor Shea2016-04-291-1/+24
| | |/ | |/| | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'sentry-filter' into 'master' Robert Speicher2016-04-291-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Prevent Rails filtered parameters from leaking to Sentry.Connor Shea2016-04-281-0/+3
| |/ / | | | | | | | | | As described in their Docs: https://docs.getsentry.com/on-premise/clients/ruby/integrations/rails/
* | | 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
View Lorry Controller Status