diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-09 18:05:21 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-09 18:05:21 +0000 |
| commit | 80427fbd20920a99f0c02866217ade695b774707 (patch) | |
| tree | 52e24733beb8a5cdd3c7efb45d852cac782b1201 | |
| parent | 68963c8653d11c45eec40318f32ad08b8be8ef54 (diff) | |
| parent | 8d570583c9aa8bf7e58fe4f8cd96a0e35f6df40b (diff) | |
| download | gitlab-ce-80427fbd20920a99f0c02866217ade695b774707.tar.gz | |
Merge branch 'update-rspec_profiling' into 'master'
Update the rspec_profiling gem to 0.0.5
Closes #27517
See merge request !9094
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -284,7 +284,7 @@ group :development, :test do gem 'rspec-retry', '~> 0.4.5' gem 'spinach-rails', '~> 0.2.1' gem 'spinach-rerun-reporter', '~> 0.0.2' - gem 'rspec_profiling' + gem 'rspec_profiling', '~> 0.0.5' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.7.0' diff --git a/Gemfile.lock b/Gemfile.lock index c5dd6ab8d22..235426afa49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -638,7 +638,7 @@ GEM rspec-retry (0.4.5) rspec-core rspec-support (3.5.0) - rspec_profiling (0.0.4) + rspec_profiling (0.0.5) activerecord pg rails @@ -738,7 +738,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.11) + sqlite3 (1.3.13) stackprof (0.2.10) state_machines (0.4.0) state_machines-activemodel (0.4.0) @@ -962,7 +962,7 @@ DEPENDENCIES rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.5.0) rspec-retry (~> 0.4.5) - rspec_profiling + rspec_profiling (~> 0.0.5) rubocop (~> 0.46.0) rubocop-rspec (~> 1.9.1) ruby-fogbugz (~> 0.2.1) @@ -1011,4 +1011,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.14.2 + 1.14.3 |