diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2016-01-14 21:58:17 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2016-01-14 21:58:17 +0100 |
| commit | 768721dc5895467130b9a3ada9c740a050f4fdff (patch) | |
| tree | d96448edb9490825e8384a1b42bbfafa98140a33 /lib/banzai/lazy_reference.rb | |
| parent | 7ed5bc5c9b69e6caf45541dc8f820aa59a20c160 (diff) | |
| parent | 2f2aada3b6b900fdff276aafc3f93e5a1c1465c6 (diff) | |
| download | gitlab-ce-768721dc5895467130b9a3ada9c740a050f4fdff.tar.gz | |
Merge branch 'master' into ci/api-triggers
* master: (150 commits)
fixes margin and padding
Update mailroom/postfix documentation [ci skip]
Fix css mess around git clone panel. Align it properly
Fix missing padding for user/group pages
Fix parse_gollum_tags matcher
Update documentation on Banzai::Filter::GollumTagsFilter
Add tests for the wiki pipeline
Refactoring Banzai::Filter::GollumTagsFilter
Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter
Remove GollumTagsPipeline
Refactoring Gitlab::GithubImport::Importer
Remove unnecessary brackets on WIKI_SLUG_ID route constraints
Move js function to removing accents to vendor/assets/javascripts
Update CHANGELOG
Use the WikiPipeline when rendering the wiki markdown content
Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML
Relax constraints for wiki slug
Import GitHub wiki into GitLab
Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus
Revert changes to how the notes are paginated in the API
...
Conflicts:
doc/api/README.md
lib/api/entities.rb
Diffstat (limited to 'lib/banzai/lazy_reference.rb')
| -rw-r--r-- | lib/banzai/lazy_reference.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/banzai/lazy_reference.rb b/lib/banzai/lazy_reference.rb index 073ec5d9801..1095b4debc7 100644 --- a/lib/banzai/lazy_reference.rb +++ b/lib/banzai/lazy_reference.rb @@ -1,5 +1,3 @@ -require 'banzai' - module Banzai class LazyReference def self.load(refs) |