summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Track a user who created a pipelineKamil Trzcinski2016-07-151-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-lfs-ci-fetch' into 'master' Rémy Coutable2016-07-183-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix LFS specsfix-lfs-ci-fetchKamil Trzcinski2016-07-152-2/+2
| * | | | Fix fetching LFS objects for private CI projectsKamil Trzcinski2016-07-151-1/+1
* | | | | Merge branch 'normalize_emoji_aliases_paths' into 'master' Rémy Coutable2016-07-181-2/+2
|\ \ \ \ \
| * | | | | Fix not normalized emoji pathsdixpac2016-07-141-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch '19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wik...Stan Hu2016-07-161-1/+6
|\ \ \ \ \
| * | | | | 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-151-1/+6
* | | | | | Merge branch 'syntax-highlight-unknown-language' into 'master' Robert Speicher2016-07-161-7/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Don't fail to highlight when Rouge doesn't have a lexerDouwe Maan2016-07-151-7/+8
* | | | | | Merge branch 'mentioned-user-tooltip' into 'master' Douwe Maan2016-07-151-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Display tooltip for mentioned users and groups (!5261)winniehell2016-07-141-5/+5
| |/ / / /
* | | | | Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-153-184/+39
|\ \ \ \ \
| * | | | | use %(...) and %[...] in favor of %<...>feature.rouge-20http://jneen.net/2016-07-142-4/+4
| * | | | | use the proper variable names o_Ohttp://jneen.net/2016-07-141-2/+2
| * | | | | 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
| * | | | | eliminate the final newline in <pre> blockshttp://jneen.net/2016-07-141-1/+5
| * | | | | bugfix: don't error in css_classeshttp://jneen.net/2016-07-141-5/+8
| * | | | | 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
| |/ / / /
* | | | | Merge branch 'fix/project-export-filename' into 'master' Douwe Maan2016-07-152-2/+10
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-exp...fix/project-export-filenameJames Lopez2016-07-153-26/+42
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | add project name and namespace to filename on project exportJames Lopez2016-07-152-2/+10
| | |/ / / | |/| | |
* | | | | Merge branch 'fix/ee-to-ce-import'Douwe Maan2016-07-151-2/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix EE => CE project import, and updated JSON specJames Lopez2016-07-141-2/+6
| |/ / /
* | | | Merge branch 'disable-statement-timeout' into 'master' Robert Speicher2016-07-151-0/+10
|\ \ \ \
| * | | | Disable statement timeout outside of transaction and during adding concurrent...Stan Hu2016-07-141-1/+3
| * | | | Disable PostgreSQL statement timeout during migrationsStan Hu2016-07-141-0/+8
| |/ / /
* | | | fixed similar issue with gitlab.com importer because why not!James Lopez2016-07-141-25/+28
* | | | fix updated_at not preserved after import - for GitLab projectsJames Lopez2016-07-141-1/+4
|/ / /
* | | 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