fix deleted file display when using new gitlab_git gem, and add new gitlab_git gem
This commit is contained in:
parent
884352294d
commit
1d8dcfaf8b
|
@ -20,6 +20,7 @@ v 7.7.0
|
||||||
- Add alert message in case of outdated browser (IE < 10)
|
- Add alert message in case of outdated browser (IE < 10)
|
||||||
-
|
-
|
||||||
- Added API support for sorting projects
|
- Added API support for sorting projects
|
||||||
|
- Update gitlab_git to version 7.0.0.rc13
|
||||||
|
|
||||||
v 7.6.0
|
v 7.6.0
|
||||||
- Fork repository to groups
|
- Fork repository to groups
|
||||||
|
|
2
Gemfile
2
Gemfile
|
@ -37,7 +37,7 @@ gem "browser"
|
||||||
|
|
||||||
# Extracting information from a git repository
|
# Extracting information from a git repository
|
||||||
# Provide access to Gitlab::Git library
|
# Provide access to Gitlab::Git library
|
||||||
gem "gitlab_git", '7.0.0.rc12'
|
gem "gitlab_git", '7.0.0.rc13'
|
||||||
|
|
||||||
# Ruby/Rack Git Smart-HTTP Server Handler
|
# Ruby/Rack Git Smart-HTTP Server Handler
|
||||||
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
|
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
|
||||||
|
|
|
@ -183,7 +183,7 @@ GEM
|
||||||
mime-types (~> 1.19)
|
mime-types (~> 1.19)
|
||||||
gitlab_emoji (0.0.1.1)
|
gitlab_emoji (0.0.1.1)
|
||||||
emoji (~> 1.0.1)
|
emoji (~> 1.0.1)
|
||||||
gitlab_git (7.0.0.rc12)
|
gitlab_git (7.0.0.rc13)
|
||||||
activesupport (~> 4.0)
|
activesupport (~> 4.0)
|
||||||
charlock_holmes (~> 0.6)
|
charlock_holmes (~> 0.6)
|
||||||
gitlab-linguist (~> 3.0)
|
gitlab-linguist (~> 3.0)
|
||||||
|
@ -643,7 +643,7 @@ DEPENDENCIES
|
||||||
gitlab-grack (~> 2.0.0.pre)
|
gitlab-grack (~> 2.0.0.pre)
|
||||||
gitlab-linguist (~> 3.0.0)
|
gitlab-linguist (~> 3.0.0)
|
||||||
gitlab_emoji (~> 0.0.1.1)
|
gitlab_emoji (~> 0.0.1.1)
|
||||||
gitlab_git (= 7.0.0.rc12)
|
gitlab_git (= 7.0.0.rc13)
|
||||||
gitlab_meta (= 7.0)
|
gitlab_meta (= 7.0)
|
||||||
gitlab_omniauth-ldap (= 1.2.0)
|
gitlab_omniauth-ldap (= 1.2.0)
|
||||||
gollum-lib (~> 3.0.0)
|
gollum-lib (~> 3.0.0)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
.diff-file{id: "diff-#{i}", data: {blob_diff_path: blob_diff_path }}
|
.diff-file{id: "diff-#{i}", data: {blob_diff_path: blob_diff_path }}
|
||||||
.diff-header{id: "file-path-#{hexdigest(diff_file.new_path || diff_file.old_path)}"}
|
.diff-header{id: "file-path-#{hexdigest(diff_file.new_path || diff_file.old_path)}"}
|
||||||
- if diff_file.deleted_file
|
- if diff_file.deleted_file
|
||||||
%span= diff_file.old_path
|
%span="#{diff_file.old_path} deleted"
|
||||||
|
|
||||||
.diff-btn-group
|
.diff-btn-group
|
||||||
- if @commit.parent_ids.present?
|
- if @commit.parent_ids.present?
|
||||||
|
|
Loading…
Reference in New Issue