summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Fixed specs and fixes based on failing specsDouwe Maan2016-08-163-16/+12
* Refactor slash command definitionDouwe Maan2016-08-123-72/+97
* Simplify the slash commands DSL to store action blocks instead of creating me...Rémy Coutable2016-08-131-43/+45
* Accept blocks for `.desc` and `.condition` slash commands DSLRémy Coutable2016-08-131-38/+73
* Make slash commands contextualRémy Coutable2016-08-131-9/+31
* Add support for no-op slash commands that appear in autocompleteRémy Coutable2016-08-131-3/+11
* Don't extract slash commands inside blockcode, blockquote or HTML tagsRémy Coutable2016-08-131-3/+48
* Support slash commands in noteable description and notesRémy Coutable2016-08-133-0/+136
* api for generating new merge requestScott Le2016-08-114-23/+48
* Merge branch 'remove-grack-lfs' into 'master' Rémy Coutable2016-08-113-590/+0
|\
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into remove-...Jacob Vosmaer2016-08-0969-385/+1358
| |\
| * | Remove obsolete codeJacob Vosmaer2016-07-223-590/+0
* | | Merge branch 'fix-gitaccess-scope' into 'master' Rémy Coutable2016-08-111-1/+1
|\ \ \
| * | | Fixing scope issue in GitAccess.Elliot Wiltshire2016-07-251-1/+1
* | | | Merge branch 'feature/svg-badge-template' into 'master' Douwe Maan2016-08-103-28/+111
|\ \ \ \
| * \ \ \ Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-099-12/+15
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Improve indentation in svg badge templateGrzegorz Bizon2016-08-081-1/+1
| * | | | Improve builds badge specs, remove legacy methodsGrzegorz Bizon2016-08-081-15/+6
| * | | | Merge branch 'master' into feature/svg-badge-templateGrzegorz Bizon2016-08-0855-371/+1210
| |\ \ \ \
| * | | | | Use new badge template to render build status badgeGrzegorz Bizon2016-08-081-0/+4
| * | | | | Add badge template class to use with SVG ERB templateGrzegorz Bizon2016-07-281-0/+63
| * | | | | Calculate build status only in build badge classGrzegorz Bizon2016-07-281-7/+13
| * | | | | Extract build status badge metadata to separate classGrzegorz Bizon2016-07-282-21/+40
* | | | | | Merge branch 'gh-pull-requests' into 'master' Douwe Maan2016-08-094-87/+39
|\ \ \ \ \ \
| * | | | | | Prefixes removed branches name with PR number when importing PR from GHgh-pull-requestsDouglas Barbosa Alexandre2016-08-082-6/+14
| * | | | | | Remove SHA suffix for removed branches name when importing PR from GHDouglas Barbosa Alexandre2016-08-082-29/+27
| * | | | | | Allow users to import cross-repository pull requests from GitHubDouglas Barbosa Alexandre2016-08-041-5/+1
| * | | | | | Does not need to disable GitHub webhooks since PRs are check out locallyDouglas Barbosa Alexandre2016-08-042-54/+0
| * | | | | | Check out locally PRs where the source/target branch were removedDouglas Barbosa Alexandre2016-08-041-7/+11
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'Douwe Maan2016-08-092-25/+116
|\ \ \ \ \ \
| * | | | | | Small refactor in Redis class and improved specsGabriel Mazetto2016-08-061-1/+5
| * | | | | | Small refactor and a few documentation fixesGabriel Mazetto2016-08-042-3/+3
| * | | | | | Few minor fixes to Redis params order and commented out sentinel configGabriel Mazetto2016-08-042-7/+7
| * | | | | | Fixed MailRoom specs and make sure it works with new resque.yml formatGabriel Mazetto2016-08-042-1/+9
| * | | | | | Fixed specs for Gitlab::Redis and code for Redis Sentinel supportGabriel Mazetto2016-08-042-9/+10
| * | | | | | Specs for RedisConfigGabriel Mazetto2016-08-041-1/+1
| * | | | | | Deduplicated resque.yml loading from several placesGabriel Mazetto2016-08-042-25/+103
| |/ / / / /
* | | | | | Merge branch 'fix/import-mr-source' into 'master' Robert Speicher2016-08-091-6/+8
|\ \ \ \ \ \
| * | | | | | fix MR source project assignmentfix/import-mr-sourceJames Lopez2016-08-091-6/+8
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'avoid-constant-warnings-in-rails' into 'master' Robert Speicher2016-08-092-2/+2
|\ \ \ \ \ \
| * | | | | | Rails prefers require_dependency so that it won't require twice:avoid-constant-warnings-in-railsLin Jen-Shin2016-08-092-2/+2
| | |/ / / / | |/| | | |
* | | | | | Memoize CI config node validator to prevent leaksfix/improve-ci-node-validatable-to-prevent-memory-leakGrzegorz Bizon2016-08-091-6/+4
| |/ / / / |/| | | |
* | | | | Merge branch 'git-http-push-check' into 'master' Robert Speicher2016-08-081-1/+1
|\ \ \ \ \
| * | | | | Stop 'git push' over HTTP earlyJacob Vosmaer2016-08-031-1/+1
* | | | | | Merge branch 'rubocop/EmptyLinesAroundModuleBody' into 'master' Douwe Maan2016-08-081-1/+0
|\ \ \ \ \ \
| * | | | | | Enable Style/EmptyLinesAroundClassBody coprubocop/EmptyLinesAroundModuleBodyGabriel Mazetto2016-08-061-1/+0
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rubocop/SpaceAroundEqualsInParameterDefault' into 'master' Douwe Maan2016-08-084-4/+4
|\ \ \ \ \ \
| * | | | | | Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-064-4/+4
| |/ / / / /
* | | | | | Merge branch 'decode-log-postreceive-args' into 'master' Douwe Maan2016-08-081-1/+0
|\ \ \ \ \ \
| * | | | | | Log base64-decoded PostReceive argumentsJacob Vosmaer2016-08-051-1/+0
| | |_|/ / / | |/| | | |
View Lorry Controller Status