Commit graph

9 commits

Author SHA1 Message Date
GitLab Bot
c9ca178ba4 Add latest changes from gitlab-org/gitlab@master 2020-10-14 12:08:58 +00:00
Yorick Peterse
55063f854d
Fix Git ignore for tmp/, shared/, and plugins/
The old rules meant that any future changes to these directories would
require the use of `git add -f` to be staged. This is problematic for
the upcoming FOSS-only mirror of GitLab. Any changes to be synced to
this mirror are staged using `git add --all .`, which due to the Git
ignore rules would not add the tmp/ and shared/ directories. This then
leads to various specs failing because they expect certain
sub-directories of these directories to be available.

This commit changes the rules so that we include the .gitkeep files,
ignore other files, and completely ignore anything in tmp/test. This
requires that the rules are specified in tmp/.gitignore and
shared/.gitignore, instead of the top-level .gitignore, without this I
could not get Git to include the .gitkeep files properly.
2019-09-03 17:03:53 +02:00
Aleksei Lipniagov
57ae2f7e2d Use separate Prometheus metrics dirs in dev/test
Store Sidekiq and Web server metrics from Prometheus in separate
directories in `development` and `test` environments.
2019-07-02 18:42:01 +03:00
Pawel Chojnacki
c134a72cdb Move Prometheus presentation logic to PrometheusText
+ Use NullMetrics to mock metrics when unused
+ Use method_missing in NullMetrics mocking
+ Update prometheus gem to version that correctly uses transitive dependencies
+ Ensure correct folders are used in Multiprocess prometheus client tests.
+ rename Sessions controller's metric
2017-06-02 19:45:58 +02:00
Pawel Chojnacki
dc4d4c18bd Ensure prometheus_data_dir exists 2017-06-02 19:45:58 +02:00
Jacob Vosmaer
275b7797c1 Add gitaly source installation instructions 2017-03-21 14:55:41 +01:00
Lasse Schuirmann
5e18a922e4 Remove tmp/.gitkeep
This file is obsolete since 5b4aba5f as it exists
solely for the directory to exist.
2015-10-04 13:49:48 +00:00
Robert Speicher
5b4aba5f56 Make sure important directories exist in git
Ensures the following directories exist after a git clone:
- public/uploads
- tmp/pids
- tmp/sockets
2014-03-30 22:45:28 -04:00
Robert Speicher
11ebbb68d8 Add tmp/.gitkeep file to ensure tmp folder exists on clone
The install guide lists it as a requirement, so we might as well have it
by default.
2012-09-04 05:28:48 -04:00