diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-19 14:00:14 -0400 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-19 14:00:14 -0400 |
| commit | 27e0c7723ca1eb85222210a20fd3fee1d77733f7 (patch) | |
| tree | 0b25b0122c7918382c22ab277df421585f9e58b1 /app/assets/javascripts/application.js.coffee | |
| parent | ee2dc0624093a0fe8665778fd0cc734754e7cdc9 (diff) | |
| parent | 0063194ad6029915361d282392b6ab207ffd1520 (diff) | |
| download | gitlab-ce-27e0c7723ca1eb85222210a20fd3fee1d77733f7.tar.gz | |
Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipeline
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/assets/javascripts/application.js.coffee')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 6f435e4c542..5bac8eef1cb 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -174,7 +174,7 @@ $ -> $('.trigger-submit').on 'change', -> $(@).parents('form').submit() - gl.utils.localTimeAgo($('abbr.timeago, .js-timeago'), false) + gl.utils.localTimeAgo($('abbr.timeago, .js-timeago'), true) # Flash if (flash = $(".flash-container")).length > 0 |