summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'disable-issue-by-email' into 'master' Robert Speicher2016-08-201-1/+2
|\
| * Disable “issue by email” feature until it uses a different tokenDouwe Maan2016-08-191-1/+2
* | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' Stan Hu2016-08-191-0/+1
|\ \ | |/ |/|
| * Support integration with Koding (online IDE)Gokmen Goksel2016-08-191-0/+1
* | Merge branch 'wall-clock-time-for-showing-pipeline' into 'master' Robert Speicher2016-08-191-1/+1
|\ \ | |/ |/|
| * Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-201-2/+1
| |\
| * \ Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-1915-15/+698
| |\ \
| * | | Use travel_to instead of dependency injection, feedback:Lin Jen-Shin2016-08-191-5/+0
| * | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-1722-152/+528
| |\ \ \
| * | | | Introduce Gitlab::Utils.now so that it's easier to stubLin Jen-Shin2016-08-151-1/+6
* | | | | Merge branch '20895-inline-comments-for-first-commit' into 'master' Douwe Maan2016-08-191-6/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix line commenting for the initial commitSean McGivern2016-08-191-6/+12
| | |_|/ | |/| |
* | | | Merge branch 'fix/improve-test-coverage-badge-pipelines' into 'master' Douwe Maan2016-08-191-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Render coverage badge for latest successful pipelineGrzegorz Bizon2016-08-181-2/+1
* | | | 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