summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix spec to set import_url before attempting to create import_dataallow-blank-import-urlStan Hu2016-07-171-1/+1
* Allow a project import URL to be blank to prevent false positivesStan Hu2016-07-172-4/+4
* Merge branch '19907-deploy' into 'master' Kamil Trzciński2016-07-172-11/+4
|\
| * Align cancel and retry buttons19907-deployAnnabel Dunstone2016-07-162-1/+3
| * Remove deploy to production buttonAnnabel Dunstone2016-07-161-10/+1
* | Merge branch 'doc-ci-anchor-yaml-fix' into 'master' Achilleas Pipinellis2016-07-171-2/+2
|\ \ | |/ |/|
| * Fix CI yaml exampleAchilleas Pipinellis2016-07-171-2/+2
|/
* Merge branch '19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wik...Stan Hu2016-07-162-4/+17
|\
| * Fix a bug where the project's repository path was returned instead of the wik...19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wikiAlejandro Rodríguez2016-07-152-4/+17
* | Merge branch 'syntax-highlight-unknown-language' into 'master' Robert Speicher2016-07-162-14/+35
|\ \ | |/ |/|
| * Don't fail to highlight when Rouge doesn't have a lexerDouwe Maan2016-07-152-14/+35
* | Merge branch 'legacy-diff-notes-are-dumb' into 'master' Douwe Maan2016-07-153-7/+7
|\ \
| * | Update testslegacy-diff-notes-are-dumbDouwe Maan2016-07-151-4/+4
| * | Don't fail when a LegacyDiffNote didn't store the right diffDouwe Maan2016-07-152-3/+3
| |/
* | Merge branch 'revert-bdb6f1e6' into 'master' Douwe Maan2016-07-1516-72/+65
|\ \
| * | Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"revert-bdb6f1e6Douwe Maan2016-07-1516-72/+65
|/ /
* | Merge branch 'ci-pipeline-doesnt-require-project' into 'master' Robert Speicher2016-07-151-0/+2
|\ \
| * | Don't fail when Ci::Pipeline doesn't have a projectDouwe Maan2016-07-151-0/+2
| |/
* | Merge branch 'mentioned-user-tooltip' into 'master' Douwe Maan2016-07-152-5/+6
|\ \ | |/ |/|
| * Display tooltip for mentioned users and groups (!5261)winniehell2016-07-142-5/+6
* | Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-1511-236/+74
|\ \
| * | 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
View Lorry Controller Status