summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* use %(...) and %[...] in favor of %<...>feature.rouge-20http://jneen.net/2016-07-144-6/+6
* use the proper variable names o_Ohttp://jneen.net/2016-07-141-2/+2
* bump rouge to 2.0.3http://jneen.net/2016-07-141-1/+1
* style: factor out `@lexer` into a methodhttp://jneen.net/2016-07-141-9/+13
* fix Gitlab::Highlight#initializer bugs from rebasehttp://jneen.net/2016-07-141-1/+2
* update to rouge 2.0.2http://jneen.net/2016-07-141-1/+1
* expect final newlines from the banzai filterhttp://jneen.net/2016-07-141-1/+1
* stub out errors from the formatterhttp://jneen.net/2016-07-141-1/+1
* don't expect a random newline at the end of the thing?http://jneen.net/2016-07-141-1/+1
* don't expect &quot; encoding anymorehttp://jneen.net/2016-07-141-6/+6
* remove uses of the nowrap: featurehttp://jneen.net/2016-07-141-9/+9
* eliminate the final newline in <pre> blockshttp://jneen.net/2016-07-141-1/+5
* rm spec for a deleted methodhttp://jneen.net/2016-07-141-14/+0
* bugfix: don't error in css_classeshttp://jneen.net/2016-07-141-5/+8
* apparently this gets encoded now?http://jneen.net/2016-07-141-1/+1
* use the local lexer variable to respect plain: ...http://jneen.net/2016-07-141-1/+1
* we no longer encode double-quoteshttp://jneen.net/2016-07-141-3/+3
* no longer need cgihttp://jneen.net/2016-07-141-2/+0
* inline #rouge_formatterhttp://jneen.net/2016-07-141-6/+2
* use the new token_lines interface to format lineshttp://jneen.net/2016-07-142-74/+12
* without line anchors, this is just the plain HTML formatterhttp://jneen.net/2016-07-141-1/+1
* kill the :cssclass optionhttp://jneen.net/2016-07-143-5/+1
* trim more dead codehttp://jneen.net/2016-07-141-18/+3
* remove the dead linenos and linenostart optionshttp://jneen.net/2016-07-141-44/+2
* add the wrapping back in for the banzai filterhttp://jneen.net/2016-07-141-1/+5
* kill the nowrap option in HTMLGitlab itselfhttp://jneen.net/2016-07-141-11/+1
* kill the nowrap optionhttp://jneen.net/2016-07-142-13/+8
* rm dead `highlighter` methodhttp://jneen.net/2016-07-141-4/+0
* the call site always specifies this optionhttp://jneen.net/2016-07-141-1/+0
* do this thing in a clearer wayhttp://jneen.net/2016-07-141-3/+6
* remove the unused inline_theme featurehttp://jneen.net/2016-07-141-10/+2
* deprecate @anchorlinenoshttp://jneen.net/2016-07-141-10/+0
* update rouge, gollum-lib, and github-markuphttp://jneen.net/2016-07-142-12/+12
* Merge branch 'fix/persistent-import-data' into 'master' Fatih Acet2016-07-146-8/+40
|\
| * udpated JS based on feedbackfix/persistent-import-dataJames Lopez2016-07-141-5/+2
| * some JS magic to fix empty URL bugJames Lopez2016-07-132-2/+10
| * updated create_or_update_import_data to use guard clauseJames Lopez2016-07-131-1/+3
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/persistent-...James Lopez2016-07-13170-1034/+1734
| |\
| * | fix more specsJames Lopez2016-07-131-1/+5
| * | Merge remote-tracking branch 'gitlab/fix/persistent-import-data' into fix/per...James Lopez2016-07-131-1/+1
| |\ \
| | * | Update CHANGELOGJames Lopez2016-07-121-1/+1
| * | | fix specsJames Lopez2016-07-131-1/+1
| |/ /
| * | added changelogJames Lopez2016-07-121-0/+3
| * | fixes a few issues to do with import_url not being saved correctly for import...James Lopez2016-07-123-5/+23
* | | Merge branch 'cleanup-feature-proposal' into 'master' Job van der Voort2016-07-141-1/+2
|\ \ \
| * | | Cleanup feature proposal templatecleanup-feature-proposalMark Pundsack2016-07-131-1/+2
* | | | Merge branch 'project-files-header-cursor' into 'master' Fatih Acet2016-07-142-2/+2
|\ \ \ \
| * | | | Use default cursor for table header of project files (!5165)winniehell2016-07-142-2/+2
* | | | | Merge branch 'lbennett/gitlab-ce-18120-focus-filter-shortcut' into 'master' Fatih Acet2016-07-145-12/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Review changeslbennett/gitlab-ce-18120-focus-filter-shortcutLuke "Jared" Bennett2016-07-112-8/+9