summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cs-gemojione-3' into 'master' Robert Speicher2016-07-182-23/+18
|\
| * Upgrade Gemojione from 2.6.1 to 3.0.1.Connor Shea2016-07-182-23/+18
* | Merge branch '19820-safer-diffs' into 'master' Douwe Maan2016-07-181-5/+1
|\ \ | |/ |/|
| * Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-5/+1
* | Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-189-136/+213
|\ \
| * | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-189-136/+213
* | | Merge branch '18593-avoid-parse_html-when-rinku-didnt-do-anything' into 'mast...Yorick Peterse2016-07-181-0/+2
|\ \ \
| * | | Don't parse Rinku returned value to DocFragment when it didn't change the ori...18593-avoid-parse_html-when-rinku-didnt-do-anythingPaco Guzman2016-07-181-0/+2
* | | | Merge branch 'store-variables-and-when-in-builds-table' into 'master' Rémy Coutable2016-07-181-15/+38
|\ \ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into store-variables...store-variables-and-when-in-builds-tableKamil Trzcinski2016-07-1816-227/+116
| |\ \ \ \
| * | | | | Store when and yaml variables in builds tableKamil Trzcinski2016-07-161-15/+38
* | | | | | Merge branch 'docker-registry-work-with-redirect' into 'master' Rémy Coutable2016-07-182-21/+50
|\ \ \ \ \ \
| * | | | | | Make rubocop happyKamil Trzcinski2016-07-151-1/+1
| * | | | | | Explicitly remove authorization token and make sure that invalid addresses ar...Kamil Trzcinski2016-07-151-37/+35
| * | | | | | Allow blob to be redirectedKamil Trzcinski2016-07-151-3/+34
| * | | | | | Make docker registry work with location redirects when external storage is usedKamil Trzcinski2016-07-151-1/+1
* | | | | | | allow empty repos on import/exportJames Lopez2016-07-184-10/+5
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'api-isssues-due-date' into 'master' Rémy Coutable2016-07-182-4/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | API: Expose due_date for issuesapi-isssues-due-dateRobert Schilling2016-07-122-4/+7
* | | | | | Merge branch 'track-pipeline-user' into 'master' Rémy Coutable2016-07-181-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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
View Lorry Controller Status