diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-11 05:17:09 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-11 05:17:09 +0000 |
| commit | 78bf00c78873c025b4930483be26b2892fd32df1 (patch) | |
| tree | 329b29ff4af89c31a550fa58668b9b2612944bb1 | |
| parent | 466651553839d77c0f7352399b5714341ff4fa02 (diff) | |
| parent | 49eacb84e92309b54e425f0579ab2c3f91569d97 (diff) | |
| download | gitlab-ce-78bf00c78873c025b4930483be26b2892fd32df1.tar.gz | |
Merge branch 'fix-git-blame' into 'master'
Fix File blame not respecting branch selection
See merge request !1382
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index bef78efe60a..6e61a14f067 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 - - - @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 4d4be5674dc..c2513712b41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) |