diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-05-02 14:46:57 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-05-02 14:46:57 +0900 |
| commit | 502b17092755202c056d8fe547c7f64533e0f64f (patch) | |
| tree | e32620a93b4548291a62510ae653d573c1dfd9ca /qa/Gemfile.lock | |
| parent | 1d53918b62452f9758a837744bac6ca051801a6a (diff) | |
| parent | 4b34c875f7166d8bddf57952c3ed46b1291bdf77 (diff) | |
| download | gitlab-ce-502b17092755202c056d8fe547c7f64533e0f64f.tar.gz | |
Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all
Diffstat (limited to 'qa/Gemfile.lock')
| -rw-r--r-- | qa/Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 565adac7499..1bc424335f8 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -47,7 +47,7 @@ GEM mini_portile2 (2.3.0) minitest (5.11.1) netrc (0.11.0) - nokogiri (1.8.1) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) pry (0.11.3) coderay (~> 1.1.0) |