-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch 'upgrade-timeago' into 'master'
Replace jQuery.timeago with timeago.js ## What does this MR do? Replaces jQuery.timeago with [timeago.js](https://github.com/hustcc/timeago.js) ## Are there points in the code the reviewer needs to double check? * Check to make sure its working everywhere* Check to make sure the timeago wording matches what we have now (I think I've got this down but an extra pair of would help too) ## Why was this MR needed? * The jQuery.timeago version we have is outdated * timeago.js is smaller (7.19 KB => 4.52 KB) * timeago.js has no jQuery dependency * removes all inline javascript for timeago ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21793 See merge request !6274
No related branches found
No related tags found
Pipeline #
Showing
- app/assets/javascripts/activities.js 2 additions, 2 deletionsapp/assets/javascripts/activities.js
- app/assets/javascripts/application.js 0 additions, 4 deletionsapp/assets/javascripts/application.js
- app/assets/javascripts/build.js 1 addition, 1 deletionapp/assets/javascripts/build.js
- app/assets/javascripts/compare.js 2 additions, 1 deletionapp/assets/javascripts/compare.js
- app/assets/javascripts/lib/utils/common_utils.js 0 additions, 19 deletionsapp/assets/javascripts/lib/utils/common_utils.js
- app/assets/javascripts/lib/utils/datetime_utility.js 54 additions, 41 deletionsapp/assets/javascripts/lib/utils/datetime_utility.js
- app/assets/javascripts/lib/utils/timeago.js 237 additions, 0 deletionsapp/assets/javascripts/lib/utils/timeago.js
- app/assets/javascripts/merge_request_widget.js.es6 1 addition, 1 deletionapp/assets/javascripts/merge_request_widget.js.es6
- app/assets/javascripts/milestone_select.js 1 addition, 1 deletionapp/assets/javascripts/milestone_select.js
- app/helpers/application_helper.rb 7 additions, 11 deletionsapp/helpers/application_helper.rb
- app/views/events/_event.html.haml 1 addition, 1 deletionapp/views/events/_event.html.haml
- app/views/projects/_last_commit.html.haml 1 addition, 1 deletionapp/views/projects/_last_commit.html.haml
- app/views/projects/blame/show.html.haml 1 addition, 1 deletionapp/views/projects/blame/show.html.haml
- app/views/projects/ci/pipelines/_pipeline.html.haml 1 addition, 1 deletionapp/views/projects/ci/pipelines/_pipeline.html.haml
- app/views/projects/refs/logs_tree.js.haml 3 additions, 0 deletionsapp/views/projects/refs/logs_tree.js.haml
- changelogs/unreleased/upgrade-timeago.yml 4 additions, 0 deletionschangelogs/unreleased/upgrade-timeago.yml
- spec/helpers/application_helper_spec.rb 3 additions, 21 deletionsspec/helpers/application_helper_spec.rb
- spec/javascripts/merge_request_widget_spec.js 1 addition, 1 deletionspec/javascripts/merge_request_widget_spec.js
- vendor/assets/javascripts/jquery.timeago.js 0 additions, 182 deletionsvendor/assets/javascripts/jquery.timeago.js
app/assets/javascripts/lib/utils/timeago.js
0 → 100644
changelogs/unreleased/upgrade-timeago.yml
0 → 100644
Please register or sign in to comment