summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add boards controller to issue nav itemissue-boards-navAnnabel Dunstone2016-08-181-1/+1
* Merge branch 'rs-update-doorkeeper' into 'master' Robert Speicher2016-08-182-3/+3
|\
| * Update doorkeeper to 4.2.0Robert Speicher2016-08-182-3/+3
* | Merge branch '2fa-check-git-http' into 'master' Robert Speicher2016-08-185-6/+92
|\ \
| * | 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-174-27/+37
| * | Moved 2FA check to `auth.rb` and cleaned up the flow `authenticate_user`Patricio Cano2016-08-162-10/+16
| * | Added better information about the personal tokensPatricio Cano2016-08-162-2/+5
| * | 2FA check is now done in the main GitHTTPClientControllerPatricio Cano2016-08-161-0/+7
| * | Added CHANGELOG itemPatricio Cano2016-08-161-0/+1
| * | Deny Git over HTTP access to users that have 2FA enabled, unless they use a P...Patricio Cano2016-08-162-0/+45
| * | Allow Git over HTTP access using Personal Access TokensPatricio Cano2016-08-161-0/+9
* | | Merge branch '21028-missing-default-sort-for-users-with-an-existing-cookie' i...Robert Speicher2016-08-182-0/+29
|\ \ \
| * | | Handle legacy sort order values21028-missing-default-sort-for-users-with-an-existing-cookieSean McGivern2016-08-182-0/+29
| | |/ | |/|
* | | Merge branch '2fa-api-check' into 'master' Robert Speicher2016-08-187-3/+50
|\ \ \
| * | | Small refactor and syntax fixes.2fa-api-checkPatricio Cano2016-08-185-6/+5
| * | | Removed unnecessary service for user retrieval and improved API error message.Patricio Cano2016-08-184-34/+3
| * | | Added documentation and CHANGELOG itemPatricio Cano2016-08-186-5/+6
| * | | Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner P...Patricio Cano2016-08-187-1/+79
| |/ /
* | | Merge branch 'rs-issue-21017' into 'master' Robert Speicher2016-08-184-3/+48
|\ \ \ | |/ / |/| |
| * | Update Hamlit to 2.6.1rs-issue-21017Robert Speicher2016-08-184-3/+48
* | | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-1856-136/+2613
|\ \ \
| * | | Fix behavior around commands with optional arguments4273-slash-commandsDouwe Maan2016-08-185-42/+63
| * | | Fix behavior of label_ids and add/remove_label_idsDouwe Maan2016-08-181-7/+8
| * | | Remove unneeded aliasesDouwe Maan2016-08-188-117/+109
| * | | Address feedbackDouwe Maan2016-08-174-23/+19
| * | | Fix specs and implement fixes based on failing specsDouwe Maan2016-08-1711-84/+75
| * | | Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-16238-892/+4066
| |\ \ \
| * | | | Fixed specs and fixes based on failing specsDouwe Maan2016-08-1613-428/+365
| * | | | Prefer `/reopen` over `/open`, remove `/reassign`Douwe Maan2016-08-122-24/+24
| * | | | Allow setting labels, milestones and assignee based on nameDouwe Maan2016-08-121-3/+9
| * | | | Force notes poll after commands have been executedDouwe Maan2016-08-124-33/+35
| * | | | Autocomplete based on names and aliasesDouwe Maan2016-08-121-0/+16
| * | | | Link to slash commands documentation from form hintsDouwe Maan2016-08-123-4/+11
| * | | | Disable slash commands on edit formsDouwe Maan2016-08-125-7/+13
| * | | | Fix autocomplete on commit and issue/MR edit pagesDouwe Maan2016-08-123-7/+8
| * | | | Refactor slash command definitionDouwe Maan2016-08-1211-164/+190
| * | | | Only autocomplete commands at the beginning of a lineDouwe Maan2016-08-121-2/+11
| * | | | Simplify the slash commands DSL to store action blocks instead of creating me...Rémy Coutable2016-08-1316-159/+296
| * | | | New TodoService#todo_exists? methodRémy Coutable2016-08-134-3/+19
| * | | | Accept blocks for `.desc` and `.condition` slash commands DSLRémy Coutable2016-08-133-154/+171
| * | | | Make slash commands contextualRémy Coutable2016-08-1310-65/+394
| * | | | Add support for no-op slash commands that appear in autocompleteRémy Coutable2016-08-135-14/+35
| * | | | Don't extract slash commands inside blockcode, blockquote or HTML tagsRémy Coutable2016-08-136-16/+98
| * | | | Add the /title slash commandRémy Coutable2016-08-136-12/+89
| * | | | New Notes::SlashCommandsService serviceRémy Coutable2016-08-1310-251/+387
| * | | | Enforce permissions in `{Issues,MergeRequests}::{Close,Reopen}Service`Rémy Coutable2016-08-139-21/+178
| * | | | Support slash commands in noteable description and notesRémy Coutable2016-08-1331-58/+1552
* | | | | Merge branch '3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a...Jacob Schatz2016-08-184-4/+5
|\ \ \ \ \
| * | | | | Fix Ace syntax highlighting with compiled assets3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webuiSean McGivern2016-08-174-4/+5