diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-24 11:51:08 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-24 11:51:08 -0800 |
| commit | ecb12f211150f30383a8aadedebcdcc845adf39a (patch) | |
| tree | e3fcabe8bacc0a34c018c9a24a2cb7bd9c119b8a /Gemfile | |
| parent | 63c4f3ca7665d076ea143991823ec99c8f996a73 (diff) | |
| parent | 75048fcd6917cfc25795bcca0929d442f9c65be4 (diff) | |
| download | gitlab-ce-ecb12f211150f30383a8aadedebcdcc845adf39a.tar.gz | |
Merge branch 'master' into update_grack
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -50,7 +50,7 @@ gem 'gitlab_omniauth-ldap', '1.2.0', require: "omniauth-ldap" gem 'gollum-lib', '~> 4.0.0' # Language detection -gem "gitlab-linguist", "~> 3.0.0", require: "linguist" +gem "gitlab-linguist", "~> 3.0.1", require: "linguist" # API gem "grape", "~> 0.6.1" |