summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2fa-check-git-http' into 'master' Robert Speicher2016-08-181-6/+38
|\
| * Refactor `find_for_git_client` and its related methods.2fa-check-git-httpPatricio Cano2016-08-181-20/+25
| * Refactor `find_for_git_client` method to not use assignment in conditionals a...Patricio Cano2016-08-171-13/+25
| * Moved 2FA check to `auth.rb` and cleaned up the flow `authenticate_user`Patricio Cano2016-08-161-2/+8
| * Allow Git over HTTP access using Personal Access TokensPatricio Cano2016-08-161-0/+9
* | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-184-0/+278
|\ \
| * | Fix behavior around commands with optional arguments4273-slash-commandsDouwe Maan2016-08-182-11/+13
| * | Address feedbackDouwe Maan2016-08-172-17/+16
| * | Fix specs and implement fixes based on failing specsDouwe Maan2016-08-172-9/+17
| * | Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-1626-158/+602
| |\ \
| * | | 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
* | | | Merge branch 'custom-events-tracking' into 'master' Douwe Maan2016-08-175-4/+43
|\ \ \ \
| * | | | Tracking of custom eventscustom-events-trackingYorick Peterse2016-08-175-4/+43
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'origin/master' into mc-uiSean McGivern2016-08-1716-92/+320
|\ \ \ \
| * | | | Better formatting for downtime check messagesfix-downtime-check-formattingYorick Peterse2016-08-171-2/+13
| * | | | Fixed downtime check label colouringYorick Peterse2016-08-171-2/+2
| |/ / /
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-...Kamil Trzcinski2016-08-1611-82/+231
| |\ \ \
| | * \ \ Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-168-27/+226
| | |\ \ \
| | | * | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-168-27/+226
| | * | | | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changesTimothy Andrew2016-08-161-6/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-161-6/+3
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Merge branch 'fix/export-att-inclusion' into 'master' Douwe Maan2016-08-151-6/+3
| | | | |\ \
| | | | | * | refactor parse_hash based on feedbackJames Lopez2016-08-111-3/+3
| | | | | * | Fix attribute inclusion in import/export config ignored in some casesJames Lopez2016-08-111-6/+3
| | * | | | | Improve EE compatibility with protected branch access levels.Timothy Andrew2016-08-161-2/+2
| | |/ / / /
| | * | | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-151-47/+0
| | |\ \ \ \
| | | * | | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-151-81/+0
| | | * | | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-151-0/+4
| | | * | | | Refactored spam related code even furtherPatricio Cano2016-08-151-6/+2
| | | * | | | Complete refactor of the `Spammable` concern and tests:Patricio Cano2016-08-151-0/+34
| | | |/ / /
| * | | | | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1510-69/+296
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-151-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-124-23/+48
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Simplify the name for data builder, feedback:Lin Jen-Shin2016-08-124-4/+4
| * | | | | Prefer extend self over module_function, feedback:Lin Jen-Shin2016-08-124-4/+4
| * | | | | Remove stage parameter from send payloadKamil Trzcinski2016-08-111-5/+1
| * | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-114-591/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-1132-181/+473
| |\ \ \ \ \ \
| * | | | | | | We still need to skip loading config_processor if skip_ci?Lin Jen-Shin2016-08-051-1/+1
| * | | | | | | Move those builders to their own namespace, feedback:Lin Jen-Shin2016-08-043-6/+12
| * | | | | | | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-021-0/+66
* | | | | | | | Merge branch 'master' into mc-uiDouwe Maan2016-08-1511-70/+297
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Add small corrections to test coverage report badgeGrzegorz Bizon2016-08-151-2/+2
View Lorry Controller Status