summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* use the local lexer variable to respect plain: ...http://jneen.net/2016-07-141-1/+1
* 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-141-11/+5
* 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
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-139-213/+136
* Merge branch 'better-parallel-diff' into 'master' Robert Speicher2016-07-131-74/+55
|\
| * Actually render old and new sections of parallel diff next to each otherbetter-parallel-diffDouwe Maan2016-07-131-74/+55
* | Merge branch 'dropdown-load-fix' into 'master' Douwe Maan2016-07-132-1/+6
|\ \
| * | deletes swn filetiagonbotelho2016-07-131-0/+0
| * | fixes test according to four-phase test patterntiagonbotelho2016-07-121-0/+0
| * | removes basicprojectwithaccess and replaces it with basicprojectdetailstiagonbotelho2016-07-123-9/+1
| * | changes the usage of simpleprojectdetails to already implemented basicproject...tiagonbotelho2016-07-122-17/+0
| * | adds basic functionality to the new endpoint of the apitiagonbotelho2016-07-123-19/+17
| * | implements filter_paramstiagonbotelho2016-07-122-0/+19
| * | changes string to symbol in paramtiagonbotelho2016-07-121-1/+1
| * | adds test to check json fields on simple request and changes the url request ...tiagonbotelho2016-07-121-1/+1
| * | fixes missing field on basicprojectdetailstiagonbotelho2016-07-121-0/+1
| * | changes the usage of simpleprojectdetails to already implemented basicproject...tiagonbotelho2016-07-122-19/+6
| * | adds basic functionality to the new endpoint of the apitiagonbotelho2016-07-123-21/+25
| * | implements filter_paramstiagonbotelho2016-07-123-0/+21
* | | Keeps issue number when importing from Gitlab.comDouglas Barbosa Alexandre2016-07-131-0/+1
* | | Merge branch '18193-developers-can-merge' into 'master' Rémy Coutable2016-07-139-136/+213
|\ \ \
| * | | Implement last round of review comments from !4892.18193-developers-can-mergeTimothy Andrew2016-07-131-2/+4
| * | | Move all "checks" under `GitLab::Checks`.Timothy Andrew2016-07-134-21/+21
| * | | Appease rubocop.Timothy Andrew2016-07-131-1/+0
| * | | Refactor `Gitlab::GitAccess`Timothy Andrew2016-07-135-134/+173
| * | | Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-132-0/+25
| * | | Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-132-3/+15
* | | | ObjectRenderer doesn't crash when no objects to cache with Rails.cache.read_m...Paco Guzman2016-07-131-4/+10
|/ / /
* | | Merge branch 'multi-line-inline-diff' into 'master' Douwe Maan2016-07-131-14/+38
|\ \ \
| * | | Rename constant to be more descriptiveDouwe Maan2016-07-131-2/+2
| * | | Extended regexes ignore whitespace, so use \smulti-line-inline-diffDouwe Maan2016-07-121-2/+2
| * | | Render inline diffs for multiple changed lines following eachotherDouwe Maan2016-07-111-14/+38
| | |/ | |/|
* | | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-strict-host-headers'Douwe Maan2016-07-122-2/+12
|\ \ \
| * | | Defend against 'Host' header injectionJacob Vosmaer2016-07-122-2/+12
| | |/ | |/|
* | | Merge branch 'fix-gh-rate-limit' into 'master' Douwe Maan2016-07-121-1/+12
|\ \ \
| * | | Memoize response from `has_rate_limit?` to avoid extra API callfix-gh-rate-limitDouglas Barbosa Alexandre2016-07-121-1/+3
| * | | Checks if rate limit is enabled instead of stubbing responseDouglas Barbosa Alexandre2016-07-121-2/+6
| * | | Fix GItHub client requests when rate limit is disabledDouglas Barbosa Alexandre2016-07-121-0/+5
| |/ /
View Lorry Controller Status