diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-04-07 21:58:19 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-07 21:58:19 +0000 |
| commit | 33a050d31cc657bdcc03e8cd971451b47bbadacf (patch) | |
| tree | 691ab8de200d2f356dda3e10de4475c1ffa1c909 /Gemfile.lock | |
| parent | 60ec9c8dbbe6ac975ffbd52a1919cd82104bda00 (diff) | |
| parent | 62521f20e4bfead7b224ea9067be9733fc6e2f90 (diff) | |
| download | gitlab-ce-33a050d31cc657bdcc03e8cd971451b47bbadacf.tar.gz | |
Merge branch 'feature/add-rake-task-prints-storage-config-in-toml' into 'master'
Add rake task that prints TOML storage configuration
Closes gitaly#173
See merge request !10448
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e4603df5f7f..bdd6bd3ad83 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -117,6 +117,7 @@ GEM chronic_duration (0.10.6) numerizer (~> 0.1.1) chunky_png (1.3.5) + citrus (3.0.2) cliver (0.3.2) coderay (1.1.1) coercible (1.0.0) @@ -784,6 +785,8 @@ GEM tilt (2.0.6) timecop (0.8.1) timfel-krb5-auth (0.8.3) + toml-rb (0.3.15) + citrus (~> 3.0, > 3.0) tool (0.2.3) truncato (0.7.8) htmlentities (~> 4.3.1) @@ -1015,6 +1018,7 @@ DEPENDENCIES test_after_commit (~> 1.1) thin (~> 1.7.0) timecop (~> 0.8.0) + toml-rb (~> 0.3.15) truncato (~> 0.7.8) u2f (~> 0.2.1) uglifier (~> 2.7.2) |