diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-16 00:48:48 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-16 00:48:48 -0700 |
| commit | d3e81673827e5171133f58f01b7054e3b602db7a (patch) | |
| tree | f34598bd9355c9b68138917a48f2156f46abead8 /Gemfile | |
| parent | 767dffcc34f5088ea472160380a84c093aa02c73 (diff) | |
| parent | 441ba5f35bd3415cd26bf3eeaead509181313058 (diff) | |
| download | gitlab-ce-d3e81673827e5171133f58f01b7054e3b602db7a.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -84,7 +84,7 @@ gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' gem 'hashie-forbidden_attributes' # Pagination -gem 'kaminari', '~> 0.17.0' +gem 'kaminari', '~> 1.0' # HAML gem 'hamlit', '~> 2.6.1' @@ -324,6 +324,7 @@ group :development, :test do gem 'spinach-rerun-reporter', '~> 0.0.2' gem 'rspec_profiling', '~> 0.0.5' gem 'rspec-set', '~> 0.1.3' + gem 'rspec-parameterized' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.7.0' |