Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update VERSION to 8.10.0-rc8v8.10.0-rc8 | Robert Speicher | 2016-07-15 | 1 | -1/+1 |
* | Merge branch 'master' into 8-10-stable | Robert Speicher | 2016-07-15 | 61 | -401/+349 |
|\ | |||||
| * | Merge branch 'legacy-diff-notes-are-dumb' into 'master' | Douwe Maan | 2016-07-15 | 3 | -7/+7 |
| |\ | |||||
| | * | Update testslegacy-diff-notes-are-dumb | Douwe Maan | 2016-07-15 | 1 | -4/+4 |
| | * | Don't fail when a LegacyDiffNote didn't store the right diff | Douwe Maan | 2016-07-15 | 2 | -3/+3 |
| * | | Merge branch 'revert-bdb6f1e6' into 'master' | Douwe Maan | 2016-07-15 | 16 | -72/+65 |
| |\ \ | |||||
| | * | | Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"revert-bdb6f1e6 | Douwe Maan | 2016-07-15 | 16 | -72/+65 |
| |/ / | |||||
| * | | Merge branch 'ci-pipeline-doesnt-require-project' into 'master' | Robert Speicher | 2016-07-15 | 1 | -0/+2 |
| |\ \ | |||||
| | * | | Don't fail when Ci::Pipeline doesn't have a project | Douwe Maan | 2016-07-15 | 1 | -0/+2 |
| | |/ | |||||
| * | | Merge branch 'mentioned-user-tooltip' into 'master' | Douwe Maan | 2016-07-15 | 2 | -5/+6 |
| |\ \ | | |/ | |/| | |||||
| | * | Display tooltip for mentioned users and groups (!5261) | winniehell | 2016-07-14 | 2 | -5/+6 |
| * | | Merge branch 'feature.rouge-20' into 'master' | Robert Speicher | 2016-07-15 | 11 | -236/+74 |
| |\ \ | |||||
| | * | | use %(...) and %[...] in favor of %<...>feature.rouge-20 | http://jneen.net/ | 2016-07-14 | 4 | -6/+6 |
| | * | | use the proper variable names o_O | http://jneen.net/ | 2016-07-14 | 1 | -2/+2 |
| | * | | bump rouge to 2.0.3 | http://jneen.net/ | 2016-07-14 | 1 | -1/+1 |
| | * | | style: factor out `@lexer` into a method | http://jneen.net/ | 2016-07-14 | 1 | -9/+13 |
| | * | | fix Gitlab::Highlight#initializer bugs from rebase | http://jneen.net/ | 2016-07-14 | 1 | -1/+2 |
| | * | | update to rouge 2.0.2 | http://jneen.net/ | 2016-07-14 | 1 | -1/+1 |
| | * | | expect final newlines from the banzai filter | http://jneen.net/ | 2016-07-14 | 1 | -1/+1 |
| | * | | stub out errors from the formatter | http://jneen.net/ | 2016-07-14 | 1 | -1/+1 |
| | * | | don't expect a random newline at the end of the thing? | http://jneen.net/ | 2016-07-14 | 1 | -1/+1 |
| | * | | don't expect " encoding anymore | http://jneen.net/ | 2016-07-14 | 1 | -6/+6 |
| | * | | remove uses of the nowrap: feature | http://jneen.net/ | 2016-07-14 | 1 | -9/+9 |
| | * | | eliminate the final newline in <pre> blocks | http://jneen.net/ | 2016-07-14 | 1 | -1/+5 |
| | * | | rm spec for a deleted method | http://jneen.net/ | 2016-07-14 | 1 | -14/+0 |
| | * | | bugfix: don't error in css_classes | http://jneen.net/ | 2016-07-14 | 1 | -5/+8 |
| | * | | apparently this gets encoded now? | http://jneen.net/ | 2016-07-14 | 1 | -1/+1 |
| | * | | use the local lexer variable to respect plain: ... | http://jneen.net/ | 2016-07-14 | 1 | -1/+1 |
| | * | | we no longer encode double-quotes | http://jneen.net/ | 2016-07-14 | 1 | -3/+3 |
| | * | | no longer need cgi | http://jneen.net/ | 2016-07-14 | 1 | -2/+0 |
| | * | | inline #rouge_formatter | http://jneen.net/ | 2016-07-14 | 1 | -6/+2 |
| | * | | use the new token_lines interface to format lines | http://jneen.net/ | 2016-07-14 | 2 | -74/+12 |
| | * | | without line anchors, this is just the plain HTML formatter | http://jneen.net/ | 2016-07-14 | 1 | -1/+1 |
| | * | | kill the :cssclass option | http://jneen.net/ | 2016-07-14 | 3 | -5/+1 |
| | * | | trim more dead code | http://jneen.net/ | 2016-07-14 | 1 | -18/+3 |
| | * | | remove the dead linenos and linenostart options | http://jneen.net/ | 2016-07-14 | 1 | -44/+2 |
| | * | | add the wrapping back in for the banzai filter | http://jneen.net/ | 2016-07-14 | 1 | -1/+5 |
| | * | | kill the nowrap option in HTMLGitlab itself | http://jneen.net/ | 2016-07-14 | 1 | -11/+1 |
| | * | | kill the nowrap option | http://jneen.net/ | 2016-07-14 | 2 | -13/+8 |
| | * | | rm dead `highlighter` method | http://jneen.net/ | 2016-07-14 | 1 | -4/+0 |
| | * | | the call site always specifies this option | http://jneen.net/ | 2016-07-14 | 1 | -1/+0 |
| | * | | do this thing in a clearer way | http://jneen.net/ | 2016-07-14 | 1 | -3/+6 |
| | * | | remove the unused inline_theme feature | http://jneen.net/ | 2016-07-14 | 1 | -10/+2 |
| | * | | deprecate @anchorlinenos | http://jneen.net/ | 2016-07-14 | 1 | -10/+0 |
| | * | | update rouge, gollum-lib, and github-markup | http://jneen.net/ | 2016-07-14 | 2 | -12/+12 |
| | |/ | |||||
| * | | Merge branch '17341-firefox-u2f' into 'master' | Robert Speicher | 2016-07-15 | 16 | -47/+85 |
| |\ \ | |||||
| | * | | Add a U2F feature spec for multiple devices owned by the same user.17341-firefox-u2f | Timothy Andrew | 2016-07-14 | 5 | -21/+57 |
| | * | | Use a single challenge for U2F authentication. | Timothy Andrew | 2016-07-14 | 5 | -12/+18 |
| | * | | Load Javascript U2F library selectively. | Timothy Andrew | 2016-07-14 | 10 | -22/+18 |
| * | | | Merge branch 'dont-ask-nearlythere' into 'master' | Achilleas Pipinellis | 2016-07-15 | 1 | -1/+1 |
| |\ \ \ |