diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-05 22:23:57 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-05 22:23:57 +0300 |
| commit | f7cf0286116cb6c771e539d34921b4b5f472be68 (patch) | |
| tree | 51742d35e080dd76a1f15dd5cb3141372a4373ba | |
| parent | db779388fee09b14ee591d9cb4981bdae3d23be9 (diff) | |
| parent | 9bca8ae8f2feefe42acbdb61004ff5c3ec2a8a65 (diff) | |
| download | gitlab-ce-f7cf0286116cb6c771e539d34921b4b5f472be68.tar.gz | |
Merge pull request #7087 from jvanbaarsen/gemfilefix
Gemfile fix
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 78561677e7a..94cf38174e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -219,12 +219,12 @@ GEM lumberjack (~> 1.0) pry (>= 0.9.12) thor (>= 0.18.1) - guard-rspec (4.2.0) - guard (>= 2.1.1) - rspec (>= 2.14, < 4.0) guard-spinach (0.0.2) guard (>= 1.1) spinach + guard-spinachrspec (4.2.0) + guard (>= 2.1.1) + rspec (>= 2.14, < 4.0) haml (4.0.5) tilt haml-rails (0.5.3) @@ -283,9 +283,9 @@ GEM treetop (~> 1.4.8) method_source (0.8.2) mime-types (1.25.1) - mini_portile (0.5.3) - minitest (4.7.5) - multi_json (1.10.0) + mini_portile (0.6.0) + minitest (5.3.4) + multi_json (1.10.1) multi_xml (0.5.5) multipart-post (1.2.0) mysql2 (0.3.16) |