summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-152-4/+2
* Merge branch 'katex-math' into 'master' Sean McGivern2016-12-155-1/+105
|\
| * Render math in Asciidoc and Markdown with KaTeX using code blocksMunken2016-12-147-35/+87
| * Better location for math lexerMunken2016-12-082-22/+21
| * Removed alias and filenamesMunken2016-12-081-2/+0
| * Hacked in Math LexerMunken2016-12-081-0/+27
| * Math works for inline syntaxMunken2016-12-081-2/+0
| * Working inline math filterMunken2016-12-082-0/+30
* | Add Gitlab::Middleware::MultipartJacob Vosmaer2016-12-153-2/+122
* | Introduce deployment services, starting with a KubernetesServiceNick Thomas2016-12-142-0/+36
* | Merge branch 'build-statuses' into 'master' Rémy Coutable2016-12-1416-43/+284
|\ \
| * | Remove trailing blank line from Allowable moduleGrzegorz Bizon2016-12-141-1/+0
| * | Make it possible to mix `Gitlab::Routing` inGrzegorz Bizon2016-12-132-1/+7
| * | Extract abilities checking module from ability modelGrzegorz Bizon2016-12-132-1/+9
| * | Refine build stop/play extended status specsGrzegorz Bizon2016-12-131-4/+4
| * | Use manual build icon in play/stop build statusesGrzegorz Bizon2016-12-132-4/+12
| * | Add specs for build stop extended detailed statusGrzegorz Bizon2016-12-121-4/+0
| * | Fix build stop extended status CSS classGrzegorz Bizon2016-12-121-4/+0
| * | Fix path to build status details in common helpersGrzegorz Bizon2016-12-121-1/+1
| * | Add action_class/action_titleKamil Trzcinski2016-12-125-3/+30
| * | Fix auto loading of constants for Ci StatusesKamil Trzcinski2016-12-124-5/+5
| * | Fix some detailed statuses specs related to abilitiesGrzegorz Bizon2016-12-122-1/+2
| * | Incorporate permission checks into new CI statusesGrzegorz Bizon2016-12-1211-49/+60
| * | Refactor ci status factories to DRY code a littleGrzegorz Bizon2016-12-125-29/+28
| * | Check permission of detailsKamil Trzcinski2016-12-124-7/+7
| * | Introduce `cancelable` and `returnable` [ci skip]Kamil Trzcinski2016-12-125-35/+64
| * | Improve actionsKamil Trzcinski2016-12-124-18/+106
| * | Added Ci::Status::BuildKamil Trzcinski2016-12-123-3/+76
* | | Merge branch 'api-cherry-pick' into 'master' Rémy Coutable2016-12-131-1/+35
|\ \ \
| * | | API: Ability to cherry-pick a commitRobert Schilling2016-12-131-1/+35
| |/ /
* | | Merge branch '25482-fix-api-sudo' into 'master' Sean McGivern2016-12-132-54/+77
|\ \ \
| * | | Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudoRémy Coutable2016-12-131-13/+11
| * | | API: Memoize the current_user so that the sudo can work properlyRémy Coutable2016-12-122-54/+79
| |/ /
* | | Merge branch 'api-simple-group-project' into 'master' Rémy Coutable2016-12-131-1/+4
|\ \ \
| * | | API: Ability to get group's project in simple representationapi-simple-group-projectRobert Schilling2016-12-131-1/+4
* | | | Merge branch 'dz-create-routes-lower-index' into 'master' Dmitriy Zaporozhets2016-12-131-0/+4
|\ \ \ \
| * | | | Add AddLowerPathIndexToRoutes to setup_postgresql.rakeDmitriy Zaporozhets2016-12-131-0/+4
| | |/ / | |/| |
* | | | Merge branch 'allow-more-filenames' into 'master' Rémy Coutable2016-12-131-2/+2
|\ \ \ \
| * | | | Allow all alphanumeric characters in file names (!8002)winniehell2016-12-131-2/+2
| | |/ / | |/| |
* | | | Merge branch 'dz-nested-group-improvements-2' into 'master' Sean McGivern2016-12-131-1/+1
|\ \ \ \
| * | | | Rename Routable.where_paths_in to Routable.where_full_path_indz-nested-group-improvements-2Dmitriy Zaporozhets2016-12-111-1/+1
* | | | | Merge branch 'api-dont-allow-blank-mr-titles' into 'master' Sean McGivern2016-12-131-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Don't allow blank MR titles in APIapi-dont-allow-blank-mr-titlesRobert Schilling2016-12-131-2/+2
| | |/ / | |/| |
* | | | Merge branch 'grapify-service-api' into 'master' Rémy Coutable2016-12-122-65/+572
|\ \ \ \
| * | | | Grapify the service APIRobert Schilling2016-12-092-65/+572
* | | | | Merge branch 'unescape-relative-path' into 'master' Gabriel Mazetto2016-12-121-8/+6
|\ \ \ \ \
| * | | | | Avoid escaping relative links in Markdown twice (!7940)winniehell2016-12-121-8/+6
* | | | | | Merge branch 'api-fix-group-projects-filter' into 'master' Rémy Coutable2016-12-121-1/+10
|\ \ \ \ \ \
| * | | | | | API: Fix groups filterRobert Schilling2016-12-121-1/+10
* | | | | | | Merge branch 'issue_25030' into 'master' Sean McGivern2016-12-121-8/+8
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |