diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-25 01:11:34 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-04-25 01:11:34 +0100 |
| commit | 5a5625a36328ab74752a0506e9dea6a67300ba1d (patch) | |
| tree | 89f5666d51279b4a01d7536443cd13b7ae060011 /lib/api/files.rb | |
| parent | eacbe4f4be7ce559bfea80c4f592c816c57531fe (diff) | |
| parent | 080aac050d852c332181a0e3fed7821d52d16c1a (diff) | |
| download | gitlab-ce-5a5625a36328ab74752a0506e9dea6a67300ba1d.tar.gz | |
Merge branch 'master' into environments-vue-5
* master:
Fix scoping issues with Spinach tests (e.g. https://gitlab.com/gitlab-org/gitlab-ce/builds/14929499)
Update changelog
Ensure replying to an individual note by email creates a note with its own discussion ID
Optimize project namespace lookup for milestones and add specs
Fix commenting on an existing discussion on an unchanged line that is no longer in the diff
Improve specs
Eliminate N+1 queries in loading namespaces for every issuable in milestones
Use jQuery niceness on blob_fork_suggestion
Add normal wrapping to task lists
Remove names from docs and add vue experts instead
Add tests
Pulled in latest changes
Pulled in latest changes from NotebookLab
Add aria to icon
Pull in fixture files from the repo
Removed notebooklab vendor file
Moved NotebookLab assets into repo
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions