diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-16 13:34:58 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-16 13:34:58 +0200 |
| commit | ac8d2eb065e9522679d4eae4649c6815daa5460c (patch) | |
| tree | 2947658dfff44a3873f7d350f0353dbdb7b9b541 /Gemfile.lock | |
| parent | 0859ba75a873ce78f77587369b9e761a2cc782db (diff) | |
| parent | 7d59ba00b9aa1a8be28f1b7ccaa1c628be90aabb (diff) | |
| download | gitlab-ce-ac8d2eb065e9522679d4eae4649c6815daa5460c.tar.gz | |
Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1f300b0c779..e913d7ae9f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -596,7 +596,7 @@ GEM powerpack (~> 0.0.6) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) - ruby-fogbugz (0.2.0) + ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-progressbar (1.7.5) ruby-saml (1.0.0) @@ -886,8 +886,8 @@ DEPENDENCIES rerun (~> 0.10.0) rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.3.0) - rubocop (~> 0.28.0) - ruby-fogbugz (~> 0.2.0) + rubocop (= 0.28.0) + ruby-fogbugz (~> 0.2.1) sanitize (~> 2.0) sass-rails (~> 4.0.5) sdoc (~> 0.3.20) |