diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-11 18:02:37 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-11 18:02:37 -0700 |
| commit | c02d891cb5f1c1df8fb69da31c901abcc4511f5b (patch) | |
| tree | 9ab9c86c3711a673ce7c9916e041d2c9c210023b /Gemfile | |
| parent | d6dda952b8eea8f6b08df9a4d12e5991929de3d4 (diff) | |
| parent | f186b20cb2e5fa59c1b7b6ac9c56141327c89e47 (diff) | |
| download | gitlab-ce-c02d891cb5f1c1df8fb69da31c901abcc4511f5b.tar.gz | |
Merge branch 'master' into new-emoji
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -39,7 +39,7 @@ gem "browser" # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '7.0.1' +gem "gitlab_git", '7.1.0' # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack' |