diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-23 17:57:12 +0000 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-23 17:57:12 +0000 |
commit | 7100b76923fc88667b1bd22b34f0a43323fe84b0 (patch) | |
tree | 52997377177c3b98b95f8326228654b338fb7f1c /lib/api/triggers.rb | |
parent | 92f9f0ea9f731748327ef06d148e8dcf0a294553 (diff) | |
parent | 8ede8603b0f6910886219ab1594eff1c0bfa3252 (diff) | |
download | gitlab-ce-7100b76923fc88667b1bd22b34f0a43323fe84b0.tar.gz |
Merge branch 'move-timeago-to-vendor-dir' into 'master'
move timeago.js to vendor directory
## What does this MR do?
moves timeago.js into `/vendor/assets/javascripts` for consistency with other external javascript libraries.
## Are there points in the code the reviewer needs to double check?
make sure timeago still works as it should...? I don't see how this could have broken anything.
## Why was this MR needed?
consistency with our guidelines
## Does this MR meet the acceptance criteria?
- 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 it does - 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?
See discussion in [!6274](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6274#note_18625583)
See merge request !7590
Diffstat (limited to 'lib/api/triggers.rb')
0 files changed, 0 insertions, 0 deletions