diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-29 10:00:29 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-29 10:00:29 +0300 |
| commit | c51ac0484f37b65b31cd83b816b151fc7d50cf05 (patch) | |
| tree | 1be6c9788fc16f65340bed60f97579c2f9a805ee /Gemfile.lock | |
| parent | 3083753c395722827385cf7542099cf6b4b60c4d (diff) | |
| parent | d859d080942175082c1a0cf34d89c0eefd1a3c39 (diff) | |
| download | gitlab-ce-c51ac0484f37b65b31cd83b816b151fc7d50cf05.tar.gz | |
Merge pull request #5962 from skv-headless/editing-preview
editing preview
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0556b870be5..dac1844b04b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,6 +101,7 @@ GEM devise-async (0.8.0) devise (>= 2.2, < 3.2) diff-lcs (1.2.5) + diffy (3.0.3) docile (1.1.1) dotenv (0.9.0) email_spec (1.5.0) @@ -577,6 +578,7 @@ DEPENDENCIES default_value_for (~> 3.0.0) devise (= 3.0.4) devise-async (= 0.8.0) + diffy (~> 3.0.3) email_spec email_validator (~> 1.4.0) enumerize |