summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixes label when unselecting an item from dropdown listas-new-issuable-form-fixesAlfredo Sumaran2016-07-172-16/+54
* Place “Assign to me” next to dropdownAlfredo Sumaran2016-07-151-2/+2
* Initialize dropdowns on Merge Request viewsAlfredo Sumaran2016-07-151-0/+2
* Restore “Assign to me” link below assignee dropdownAlfredo Sumaran2016-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
| * | 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 '17341-firefox-u2f' into 'master' Robert Speicher2016-07-1516-47/+85
|\ \
| * | Add a U2F feature spec for multiple devices owned by the same user.17341-firefox-u2fTimothy Andrew2016-07-145-21/+57
| * | Use a single challenge for U2F authentication.Timothy Andrew2016-07-145-12/+18
| * | Load Javascript U2F library selectively.Timothy Andrew2016-07-1410-22/+18
* | | Merge branch 'dont-ask-nearlythere' into 'master' Achilleas Pipinellis2016-07-151-1/+1
|\ \ \
| * | | Don't ask Heather to review documentation MR'sdont-ask-nearlythereJacob Vosmaer (GitLab)2016-07-151-1/+1
* | | | Merge branch 'kradydal/gitlab-ce-create-todos-when-issue-author-assigne-or-me...Douwe Maan2016-07-153-17/+22
|\ \ \ \
| * | | | When Issue author assign or mention himself Todos are createdKatarzyna Kobierska2016-07-143-17/+22
* | | | | Merge branch 'fix/project-export-filename' into 'master' Douwe Maan2016-07-155-3/+33
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-exp...fix/project-export-filenameJames Lopez2016-07-156-26/+56
| |\ \ \ \ \ | | | |/ / / | | |/| | |
View Lorry Controller Status