delta/gitlab/gitlab-ce.git/config/initializers, branch docs-trigger-variable

Add instrumentation to conflict classes

2016-10-13T19:16:34+00:00

Precalculate trending projects

2016-10-10T10:27:08+00:00

This commit introduces a Sidekiq worker that precalculates the list of
trending projects on a daily basis. The resulting set is stored in a
database table that is then queried by Project.trending.

This setup means that Unicorn workers no longer _may_ have to calculate
the list of trending projects. Furthermore it supports filtering without
any complex caching mechanisms.

The data in the "trending_projects" table is inserted in the same order
as the project ranking. This means that getting the projects in the
correct order is simply a matter of:

    SELECT projects.*
    FROM projects
    INNER JOIN trending_projects ON trending_projects.project_id = projects.id
    ORDER BY trending_projects.id ASC;

Such a query will only take a few milliseconds at most (as measured on
GitLab.com), opposed to a few seconds for the query used for calculating
the project ranks.

The migration in this commit does not require downtime and takes care of
populating an initial list of trending projects.

Merge branch 'memoize_shell_secret_token' into 'master'

2016-10-07T10:35:03+00:00


Memoize Github::Shell's secret token

## What does this MR do?

`API::Helpers#secret_token` was reading the secret file on every invocation. This MR reads the file in the `gitlab_shell_secret_token.rb` initializer and saves it as a class variable at `Gitlab::Shell.secret_token`

## Are there points in the code the reviewer needs to double check?

 - I'm not sure if the use of `cattr_accessor` is the best approach, or if should be moved into the `class << self` block?
 - Should `API::Helpers#secret_token` be removed in favor of using `Gitlab::Shell.secret_token`?

## Why was this MR needed?

Performance optimization.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22510

See merge request !6599

Add markdown cache columns to the database, but don't use them yet

2016-10-07T01:54:25+00:00

This commit adds a number of _html columns and, with the exception of Note,
starts updating them whenever the content of their partner fields changes.

Note has a collision with the note_html attr_accessor; that will be fixed later

A background worker for clearing these cache columns is also introduced - use
`rake cache:clear` to set it off. You can clear the database or Redis caches
separately by running `rake cache:clear:db` or `rake cache:clear:redis`,
respectively.

Memoize ActiveRecord::Migrator.migrations in tests

2016-10-06T18:14:57+00:00

Load Github::Shell's secret token from file on initialization instead of every request.

2016-10-06T15:22:37+00:00

Merge commit 'dev/security' into 'master'

2016-10-06T06:33:11+00:00

Signed-off-by: Rémy Coutable

Don't send Private-Token headers to Sentry

2016-10-04T14:57:01+00:00

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22537

add configurable email subject suffix

2016-10-03T10:07:28+00:00

Merge branch 'initialize-redis' into 'master'

2016-09-30T12:32:18+00:00


Initialize Redis pool in single-threaded context

See merge request !6613