Merge branch 'master' into rename-repo-files
Showing
... | @@ -52,7 +52,7 @@ gem 'browser', '~> 2.2' | ... | @@ -52,7 +52,7 @@ gem 'browser', '~> 2.2' |
# 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', '~> 10.2' | gem 'gitlab_git', '~> 10.3.2' | ||
# LDAP Auth | # LDAP Auth | ||
# GitLab fork with several improvements to original library. For full list of changes | # GitLab fork with several improvements to original library. For full list of changes | ||
... | @@ -223,7 +223,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' | ... | @@ -223,7 +223,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' |
gem 'addressable', '~> 2.3.8' | gem 'addressable', '~> 2.3.8' | ||
gem 'bootstrap-sass', '~> 3.3.0' | gem 'bootstrap-sass', '~> 3.3.0' | ||
gem 'font-awesome-rails', '~> 4.6.1' | gem 'font-awesome-rails', '~> 4.6.1' | ||
gem 'gemojione', '~> 2.6' | gem 'gemojione', '~> 3.0' | ||
gem 'gon', '~> 6.0.1' | gem 'gon', '~> 6.0.1' | ||
gem 'jquery-atwho-rails', '~> 1.3.2' | gem 'jquery-atwho-rails', '~> 1.3.2' | ||
gem 'jquery-rails', '~> 4.1.0' | gem 'jquery-rails', '~> 4.1.0' | ||
... | @@ -349,3 +349,6 @@ gem 'health_check', '~> 2.1.0' | ... | @@ -349,3 +349,6 @@ gem 'health_check', '~> 2.1.0' |
# System information | # System information | ||
gem 'vmstat', '~> 2.1.0' | gem 'vmstat', '~> 2.1.0' | ||
gem 'sys-filesystem', '~> 1.1.6' | gem 'sys-filesystem', '~> 1.1.6' | ||
# Secure headers for Content Security Policy | |||
gem 'secure_headers', '~> 3.3' |
![app/assets/images/emoji.png](https://lab.nexedi.com/kirr/gitlab-ce/-/raw/28f85155f5125131d109629871a3257a471ad5af/app/assets/images/emoji.png)
![app/assets/images/emoji@2x.png](https://lab.nexedi.com/kirr/gitlab-ce/-/raw/28f85155f5125131d109629871a3257a471ad5af/app/assets/images/emoji@2x.png)
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.