Merge branch 'fix-git-blame' into 'master'
Fix File blame not respecting branch selection See merge request !1382
This commit is contained in:
commit
78bf00c788
|
@ -21,14 +21,14 @@ v 7.7.0
|
|||
- Add alert message in case of outdated browser (IE < 10)
|
||||
-
|
||||
- Added API support for sorting projects
|
||||
- Update gitlab_git to version 7.0.0.rc13
|
||||
-
|
||||
- Update gitlab_git to version 7.0.0.rc14
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
- Fix File blame not respecting branch selection
|
||||
-
|
||||
-
|
||||
-
|
||||
|
|
2
Gemfile
2
Gemfile
|
@ -37,7 +37,7 @@ gem "browser"
|
|||
|
||||
# Extracting information from a git repository
|
||||
# Provide access to Gitlab::Git library
|
||||
gem "gitlab_git", '7.0.0.rc13'
|
||||
gem "gitlab_git", '7.0.0.rc14'
|
||||
|
||||
# Ruby/Rack Git Smart-HTTP Server Handler
|
||||
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
|
||||
|
|
|
@ -183,7 +183,7 @@ GEM
|
|||
mime-types (~> 1.19)
|
||||
gitlab_emoji (0.0.1.1)
|
||||
emoji (~> 1.0.1)
|
||||
gitlab_git (7.0.0.rc13)
|
||||
gitlab_git (7.0.0.rc14)
|
||||
activesupport (~> 4.0)
|
||||
charlock_holmes (~> 0.6)
|
||||
gitlab-linguist (~> 3.0)
|
||||
|
@ -643,7 +643,7 @@ DEPENDENCIES
|
|||
gitlab-grack (~> 2.0.0.pre)
|
||||
gitlab-linguist (~> 3.0.0)
|
||||
gitlab_emoji (~> 0.0.1.1)
|
||||
gitlab_git (= 7.0.0.rc13)
|
||||
gitlab_git (= 7.0.0.rc14)
|
||||
gitlab_meta (= 7.0)
|
||||
gitlab_omniauth-ldap (= 1.2.0)
|
||||
gollum-lib (~> 3.0.0)
|
||||
|
|
Loading…
Reference in New Issue