summaryrefslogtreecommitdiff
path: root/lib
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
* | Small refactor and syntax fixes.2fa-api-checkPatricio Cano2016-08-182-5/+1
* | Removed unnecessary service for user retrieval and improved API error message.Patricio Cano2016-08-181-1/+1
* | Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner P...Patricio Cano2016-08-182-0/+5
* | 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-1633-193/+650
| |\ \
| * | | 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
* | | | Do not expose projects on deploymentsZ.J. van de Weg2016-08-181-4/+3
* | | | Incorporate feedbackZ.J. van de Weg2016-08-181-8/+6
* | | | Expose project for environmentsZ.J. van de Weg2016-08-181-0/+1
* | | | Add deployment endpointsZ.J. van de Weg2016-08-183-0/+53
* | | | Add Play endpoints on BuildsZ.J. van de Weg2016-08-181-0/+23
* | | | Add docs on API for pipelines, plus minor fixeszj-pipelines-api-endpointsZ.J. van de Weg2016-08-181-1/+1
* | | | Add endpoints for pipelinesZ.J. van de Weg2016-08-183-0/+83
* | | | Merge branch 'custom-events-tracking' into 'master' Douwe Maan2016-08-176-4/+51
|\ \ \ \
| * | | | Tracking of custom eventscustom-events-trackingYorick Peterse2016-08-176-4/+51
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'origin/master' into mc-uiSean McGivern2016-08-1721-121/+362
|\ \ \ \
| * | | | 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-1615-109/+267
| |\ \ \
| | * \ \ Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-169-38/+241
| | |\ \ \
| | | * | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-169-38/+241
| | * | | | 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
| | * | | | | Fix failing tests relating to backporting ee!581.Timothy Andrew2016-08-161-12/+17
| | * | | | | Improve EE compatibility with protected branch access levels.Timothy Andrew2016-08-162-4/+6
| | * | | | | Backport changes from gitlab-org/gitlab-ee!581 to CE.Timothy Andrew2016-08-161-2/+2
| | |/ / / /
| | * | | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-152-49/+0
| | |\ \ \ \
| | | * | | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-152-83/+0
| | | * | | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-151-0/+4
| | | * | | | Refactored spam related code even furtherPatricio Cano2016-08-152-7/+3
| | | * | | | Complete refactor of the `Spammable` concern and tests:Patricio Cano2016-08-152-1/+35
| | | |/ / /
| * | | | | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1510-69/+296
| |\ \ \ \ \ | | |/ / / /
View Lorry Controller Status