summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update MAINTENANCE.md with our latest policyupdate-maintenance-mdAchilleas Pipinellis2016-07-191-8/+28
| | | | [ci skip]
* Merge branch ↵Stan Hu2016-07-162-4/+17
|\ | | | | | | | | | | | | | | | | | | '19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wiki' into 'master' Fix a bug where the project's repository path was returned instead of the wiki path Closes #19842 See merge request !5292
| * Fix a bug where the project's repository path was returned instead of the ↵19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wikiAlejandro Rodríguez2016-07-152-4/+17
| | | | | | | | wiki path
* | 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 lexer Fixes issue introduced by upgrade to Rouge 2.0 (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4691) See merge request !5291
| * 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
|\ \ | | | | | | | | | | | | | | | | | | Don't fail when a LegacyDiffNote didn't store the right diff Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/8865/ and https://sentry.gitlap.com/gitlab/gitlabcom/issues/8754/ See merge request !5287
| * | 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'" Temporarily fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19884 See merge request !5290
| * | Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"revert-bdb6f1e6Douwe Maan2016-07-1516-72/+65
|/ / | | | | This reverts merge request !4970
* | 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 project Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/8870/ See merge request !5288
| * | 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 ## What does this MR do? Display tooltip for mentioned users and groups in Markdown. ## Are there points in the code the reviewer needs to double check? I don't know. ## Why was this MR needed? No tooltips were displayed. ## What are the relevant issue numbers? fixes #17060 ## Screenshots ![user-tooltip](/uploads/501b7d1b2a5e6adcadefbc56b08422ec/user-tooltip.png) ![group-tooltip](/uploads/0152a452f9a1ed9fc86101b242f7e4c2/group-tooltip.png) See merge request !5261
| * 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
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to Rouge 2.0 ## What does this MR do? This MR is a refactor of the HTMLGitlab formatter. The original was copy-pasted from the legacy HTML formatter and adapted to suit our needs. In particular, this MR: * Strips dead code and unused options * Factors out the "wrapping" into the places that care about it - Bonzai and the view helpers * Uses the Rouge 2.0 `token_lines` method to split tokens into lines, removing the custom code we used to do the same * Uses the now-public `span` method instead of re-implementing it ourselves * Removes options to not split into lines - the places where this feature wasn't being used are now using the plain `Formatters::HTML` instead of this class See merge request !4691
| * | 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
| | | | | | | | | | | | since we've eliminated #block_code
| * | 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
| | | | | | | | | | | | and the methods that relied on them
| * | 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
| | | | | | | | | | | | | | | the <pre><code> wrapping is *always* used by the helper, and *never* by anywhere else, so pull the wrapping into the helper
| * | 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
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow U2F devices to be used in Firefox - Adds U2F support for Firefox - Improve U2F feature detection logic - Have authentication flow be closer to the spec (single challenge instead of a challenge for each `signRequest`) - Closes #17341 - Related to #15337 See merge request !5177
| * | Add a U2F feature spec for multiple devices owned by the same user.17341-firefox-u2fTimothy Andrew2016-07-145-21/+57
| | | | | | | | | | | | | | | 1. This scenario was previously tested for the registration flow, but not authentication.
View Lorry Controller Status