diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 06:06:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 06:06:24 +0300 |
| commit | d5b4360051cac307d5727df23ef6cff7d90b49a3 (patch) | |
| tree | 3a5c26a30da7b4685d41c2c0c6cd1dc6af70d7c5 /Gemfile | |
| parent | 9615736987b94a783845354ba881008e49d39238 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -273,8 +273,8 @@ gem 'mimemagic', '~> 0.3.2' gem 'fast_blank' # Parse time & duration -gem 'chronic', '~> 0.10.2' -gem 'gitlab_chronic_duration', '~> 0.10.6.1' +gem 'gitlab-chronic', '~> 0.10.5' +gem 'gitlab_chronic_duration', '~> 0.10.6.2' gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' |