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
2016-08-12Instrument Project.visible_to_userYorick Peterse
Because this method is a Rails scope we have to instrument it manually as regular the instrumentation methods only instrument methods defined directly on a Class or Module.
2016-08-11Merge branch 'remove-grack-lfs' into 'master' Rémy Coutable
Remove Grack::Auth: part 2 (LFS) Deprecate Grack::Auth and handle LFS in Rails controllers under the Project namespace. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14501 See merge request !5369
2016-08-10Merge branch 'decouple-secret-keys' into 'master' Douwe Maan
Store OTP secret key in secrets.yml ## What does this MR do? Migrate the value of `.secret` to `config/secrets.yml` if present, so that `.secret` can be rotated without preventing all users with 2FA from logging in. (On a clean setup, generate different keys for each.) ## Are there points in the code the reviewer needs to double check? I'm not sure we actually need `.secret` at all after this, but it seems safer not to touch it. ## Why was this MR needed? We have some DB encryption keys in `config/secrets.yml`, and one in `.secret`. They should all be in the same place. ## What are the relevant issue numbers? #3963, which isn't closed until I make the relevant changes in Omnibus too. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5274
2016-08-10Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'Douwe Maan
# Conflicts: # lib/gitlab/redis.rb
2016-08-09Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer
remove-grack-lfs
2016-08-05Update to send changed password notification emailsTom Bell
Add the devise initializer config setting to enable the sending of notification emails when a user changes their password.
2016-08-04Make sidekiq get config settings from Gitlab::RedisConfigGabriel Mazetto
2016-08-04Deduplicated resque.yml loading from several placesGabriel Mazetto
We will trust redis configuration params loading to Gitlab::RedisConfig.
2016-08-04Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable
Fix Import/Export not working in HA mode Use a shared path instead of `Tempfile` default `/tmp` so the import file is accessible by any GitLab instance. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20506 - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5618
2016-08-04using shared path for project import uploads and refactored gitlab remove ↵James Lopez
export worker
2016-08-04Ignore Rails/Exit cop in initializerSean McGivern
We do not want to proceed with loading the app in this case, as it could lose a secret needed to decrypt values in the database.
2016-08-03Instrument Gitlab::HighlightYorick Peterse
This class does quite a few interesting things so let's instrument it so we can see how much time is being spent in this class.
2016-08-03Clarify intentions of secret token initializerSean McGivern
2016-08-03Give priority to environment variablesSean McGivern
If an environment variable exists for secret_key_base, use that - always. But don't save it to secrets.yml. Also ensure that we never write to secrets.yml if there's a non-blank value there.
2016-08-03Store all secret keys in secrets.ymlSean McGivern
Move the last secret from .secret to config/secrets.yml, and delete .secret if it exists.
2016-08-03Store OTP secret key in secrets.ymlSean McGivern
.secret stores the secret token used for both encrypting login cookies and for encrypting stored OTP secrets. We can't rotate this, because that would invalidate all existing OTP secrets. If the secret token is present in the .secret file or an environment variable, save it as otp_key_base in secrets.yml. Now .secret can be rotated without invalidating OTP secrets. If the secret token isn't present (initial setup), then just generate a separate otp_key_base and save in secrets.yml. Update the docs to reflect that secrets.yml needs to be retained past upgrades, but .secret doesn't.
2016-08-02Instrument the Repository classYorick Peterse
Since this isn't an ActiveRecord::Base descendant it wasn't instrumented.
2016-08-01Fix RequestProfiler::Middleware error when code is reloaded in developmentAhmad Sherif
Closes #20452
2016-07-31Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured.lookatmike
2016-07-27Merge branch '20124-disable-repository-validation-during-precompile-step' ↵Stan Hu
into 'master' Add ENV variable to skip repository storages validations Closes #20124 See merge request !5478
2016-07-26Profile requests when a header is passedAhmad Sherif
2016-07-26Enable SIDEKIQ_REQUEST_STORE by defaultStan Hu
2016-07-26Add support for using RequestStore within Sidekiq tasks via ↵Stan Hu
SIDEKIQ_REQUEST_STORE env variable This significantly reduces the DB churn in the PostReceive task when it performs reference extraction. See #18663
2016-07-25Add ENV variable to skip repository storages validationsAlejandro Rodríguez
2016-07-25Instrument Nokogiri parsing methodsYorick Peterse
This allows us to see how much time is being spent in just parsing HTML/XML documents.
2016-07-24Ignore invalid trusted proxies in X-Forwarded-For headerStan Hu
Certain reverse proxies can send invalid IP addresses in the X-Forwarded-For header For example, Apache can send (null). Closes #20194
2016-07-22Handle custom Git LFS content typeJacob Vosmaer
2016-07-22Remove obsolete codeJacob Vosmaer
2016-07-22Skip repository storage path valitaions on test environmentAlejandro Rodríguez
Storage path are not created until `TestEnv.init`, so we must skip their validation on initialization.
2016-07-22Use Pathname to make the repository storage path validations more robustAlejandro Rodríguez
2016-07-21Avoid data-integrity issue when repository_downloads_path is incorrectlyDouglas Barbosa Alexandre
2016-07-21Merge branch '4142-show-inline-video' into 'master' Rémy Coutable
Add support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff) ## What does this MR do? It adds support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff). Most of the work was done by @hayesr in !3508 but a few improvements were still missing. ## Why was this MR needed? To be able to play uploaded videos in GitLab! ## What are the relevant issue numbers? Closes #4142. ## Screenshots ### Video players ![Screen_Shot_2016-07-19_at_18.44.09](/uploads/e85e531b455a41c3e66b26b356abaafd/Screen_Shot_2016-07-19_at_18.44.09.png) ----- ![Screen_Shot_2016-07-19_at_18.44.29](/uploads/05f52a812760210d1eae86a7f8fc48bc/Screen_Shot_2016-07-19_at_18.44.29.png) ----- ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Test `VideoLinkFilter` - [x] Test in `spec/features/markdown_spec.rb` - [x] Improve `spec/uploaders/file_uploader_spec.rb` - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5215
2016-07-21Don't allow `.ogg` as a valid video extensionRémy Coutable
`.ogg` is for music files. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-21Revert "Merge branch 'csp-basics' into 'master' "Robert Speicher
This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing changes made to f0b446e55506b251e85afd4bb063586bccb52eb2.
2016-07-21Revert "Merge branch 'remove-csp-sentry-reporting' into 'master' "Robert Speicher
This reverts commit 79b02e40e5842540ceff4454f6c2c51f13fc081c, reversing changes made to f2cd21e8946dcef13e8be408b96b079b5ced682a.
2016-07-20Merge branch 'email-domain-blacklist' into 'master' Robert Speicher
Added the ability to block sign ups using a domain blacklist. As part of this MR, I restructured the Application Settings form to separate **Sign up** related settings from **Sign in** related settings and make everything cleaner and easier to read. Fixes #19749 Related to #5573 See merge request !5259
2016-07-20Log cron_jobs configuration instead of raising exceptionGabriel Mazetto
2016-07-20Fix the Sentry spam from CSP violations by disabling it.Connor Shea
2016-07-19Remove duplication, useless rescue, and avoid using ActionViewRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-19First support of videos in issues, MRs and notesEric Hayes
* Registered video MIME types * Currently supporting browser-supported formats with extensions that match the mime type
2016-07-19Merge branch 'manual-actions' into 'master' Rémy Coutable
Add support for manual CI actions ## What does this MR do? This implements a `when: manual` which allows a jobs to be marked as manual actions. Manual actions have to be explicitly executed by developers. ## What are the relevant issue numbers? This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010 See merge request !5297
2016-07-19Refactor and rename `restricted_signup_domains` to `domain_whitelist` to ↵Patricio Cano
better conform to its behavior and newly introduced behavior.
2016-07-19Improve cron_jobs loading error messagesGabriel Mazetto
2016-07-18Minor policy refinements.Connor Shea
2016-07-18Document the CSP file.Connor Shea
2016-07-18Only enable CSP policies when relevant features are enabled.Connor Shea
Gravatar, Google Analytics, Piwik, Recaptcha, etc.
2016-07-18Remove background_jobs-specific headers.Connor Shea
2016-07-18Only report to Sentry when it's enabled.Connor Shea
2016-07-18Add Sidekiq-specific headers.Connor Shea
2016-07-18Add the CSP reporting URI of Sentry.Connor Shea