diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-01-30 10:10:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-01-30 10:10:46 +0000 |
| commit | a0734363b1b2c5073f810f3b189670d4a8ecbc54 (patch) | |
| tree | 7071522793b6050e697e1962b499f9dbd5925d87 /Gemfile.lock | |
| parent | e6430495ff6b709cec82693130b32578e004a504 (diff) | |
| parent | fe87d63625ee1572dd3c568173b8ec2dcd4b4360 (diff) | |
| download | gitlab-ce-a0734363b1b2c5073f810f3b189670d4a8ecbc54.tar.gz | |
Merge branch 'ce-to-ee' into 'master'
CE upstream
See merge request !1139
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d9b2325eb57..58395479bdb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -666,6 +666,11 @@ GEM rspec-retry (0.4.5) rspec-core rspec-support (3.5.0) + rspec_profiling (0.0.4) + activerecord + pg + rails + sqlite3 rubocop (0.46.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) @@ -767,6 +772,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + sqlite3 (1.3.11) stackprof (0.2.10) state_machines (0.4.0) state_machines-activemodel (0.4.0) @@ -998,6 +1004,7 @@ DEPENDENCIES rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.5.0) rspec-retry (~> 0.4.5) + rspec_profiling rubocop (~> 0.46.0) rubocop-rspec (~> 1.9.1) ruby-fogbugz (~> 0.2.1) |