summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-12-19 21:31:29 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-12-19 21:31:29 +0000
commitd1d1e7c6d70b23d614e6e6ba482e6fa5fa96f582 (patch)
tree20c093b06fa96a63fe85a100f92868ec46e2d2e2 /lib/api/files.rb
parent959981afe49afcc8595d62e198ffc95e5ded3066 (diff)
parent5b0ebbe5b4c18c136aad2a53898c1a6441d39a9d (diff)
downloadgitlab-ce-d1d1e7c6d70b23d614e6e6ba482e6fa5fa96f582.tar.gz
Merge branch 'bb-wiki-import' into 'master'
Add Wiki import to BB importer ## What does this MR do? Adds wiki importing - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25819 See merge request !8180
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions