Commit graph

10 commits

Author SHA1 Message Date
GitLab Bot
41efffa17c Add latest changes from gitlab-org/gitlab@master 2019-10-09 18:06:58 +00:00
GitLab Bot
9865665cb1 Add latest changes from gitlab-org/gitlab@master 2019-10-08 12:06:01 +00:00
GitLab Bot
5707f305f4 Add latest changes from gitlab-org/gitlab@master 2019-09-26 12:06:00 +00:00
Stan Hu
b6125f7045 Fix fast admin counters not working when PostgreSQL has secondaries
This commit does a number of things:

1. Reduces the number of queries needed by perform a single query to get all
the tuples for the relevant rows.

2. Uses a transaction to query the tuple counts to ensure that the data
is retrieved from the primary.

Closes #46742
2018-05-25 22:58:43 -07:00
Rémy Coutable
d50a80a282
Replace Gitlab::REVISION with Gitlab.revision and handle installations without a .git directory
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-24 10:14:01 +02:00
Ash McKenzie
a3234f410e Include git SHA with GitLab version 2018-04-12 15:05:09 +10:00
Sean McGivern
5883ce95ef current_application_settings belongs on Gitlab::CurrentSettings
The initializers including this were doing so at the top level, so every object
loaded after them had a `current_application_settings` method. However, if
someone had rack-attack enabled (which was loaded before these initializers), it
would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't
have that method.

To fix this:

1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need
   `Object.new.current_application_settings` to work.
2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it
   like that in several places.
3. Change the initializers to use that new form.
2017-08-31 13:38:33 +01:00
Robert Speicher
72a7b30c9f Change all :empty_project to :project 2017-08-02 17:47:31 -04:00
Connor Shea
8062380f60 Upgrade Devise from 4.1.1 to 4.2.0.
This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release.

This also replaces the deprecated Devise::TestHelpers with Devise::Test::ControllerHelpers.

Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01
2016-09-27 20:08:49 -06:00
Katarzyna Kobierska
10d9df28ec Add gitlab-workhorse version to admin dashboard
Test for showing GitLab Workhorse version on Admin Dashboard

Refactoring
2016-07-23 06:56:32 +02:00