summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into zj-slash-commands-mattermostZ.J. van de Weg2016-11-179-57/+81
|\
| * Merge branch 'feature/subscribe-to-group-level-labels' into 'master' Sean McGivern2016-11-175-20/+20
| |\
| | * Remove default value for `project` argument on subscribable concernDouglas Barbosa Alexandre2016-11-174-13/+13
| | * Pass project to Entities::Label to check if user is subscribedDouglas Barbosa Alexandre2016-11-172-7/+7
| * | Merge branch 'chat-name-authorize' into 'master' Rémy Coutable2016-11-171-0/+45
| |\ \ | | |/ | |/|
| | * Improve code design after code reviewKamil Trzcinski2016-11-161-1/+1
| | * Merge remote-tracking branch 'origin/master' into chat-name-authorizeKamil Trzcinski2016-11-1662-556/+539
| | |\
| | * | Add most of specs for chat namesKamil Trzcinski2016-11-161-1/+1
| | * | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-161-0/+45
| * | | Merge branch 'mailroom_idle_timeout' into 'master' Rémy Coutable2016-11-171-0/+1
| |\ \ \
| | * | | Make mail_room idle_timeout option configurable.Marin Jankovski2016-11-161-0/+1
| | | |/ | | |/|
| * | | Merge branch '24496-fix-internal-api-project-lookup' into 'master' Sean McGivern2016-11-162-36/+59
| |\ \ \
| | * | | Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project pathsNick Thomas2016-11-162-36/+59
* | | | | More refactoring, push present to base commandZ.J. van de Weg2016-11-176-46/+67
* | | | | Add tests for increased converageZ.J. van de Weg2016-11-175-17/+20
* | | | | Remove some commands for nowZ.J. van de Weg2016-11-177-79/+11
* | | | | Incorporate feedback, improve presenter classZ.J. van de Weg2016-11-178-55/+70
* | | | | Rename from service, and move to lib/gitlabZ.J. van de Weg2016-11-1710-4/+225
* | | | | Refactor and test Slash commandsZ.J. van de Weg2016-11-171-37/+43
* | | | | First steps on refactoring Mattermost Slash commandsZ.J. van de Weg2016-11-171-0/+84
* | | | | Make chat authorization to work [ci skip]Kamil Trzcinski2016-11-171-3/+26
* | | | | Add most of specs for chat namesKamil Trzcinski2016-11-171-1/+1
* | | | | Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-171-0/+45
|/ / / /
* | | | Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan2016-11-161-16/+1
|\ \ \ \
| * | | | Defer saving project services to the database if there are no user changesadam-build-missing-services-when-necessaryAdam Niedzielski2016-11-161-16/+1
* | | | | Merge branch '23117-search-for-a-filename-in-a-project' into 'master' Sean McGivern2016-11-161-2/+49
|\ \ \ \ \
| * | | | | Search for a filename in a project23117-search-for-a-filename-in-a-projectValery Sizov2016-11-161-2/+49
* | | | | | Merge branch 'fix_labels_api_adding_missing_parameter' into 'master' Sean McGivern2016-11-161-1/+12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fix indentationFrancesco Coda Zabetta2016-11-141-7/+7
| * | | | | fix labels API adding missing parameter (current_user)Francesco Coda Zabetta2016-11-141-1/+12
* | | | | | Merge branch '23584-triggering-builds-from-webhooks' into 'master' Rémy Coutable2016-11-151-1/+1
|\ \ \ \ \ \
| * | | | | | Add ref parameter for triggerring builds with gitlab webhook from other project.Dmitry Poray2016-11-151-1/+1
* | | | | | | Merge branch 'grapify-notes-api' into 'master' Rémy Coutable2016-11-151-67/+57
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Grapify the notes APIgrapify-notes-apiRobert Schilling2016-11-151-67/+57
* | | | | | | Merge branch 'grapify-groups-api' into 'master' Rémy Coutable2016-11-151-82/+74
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Grapify the group APIRobert Schilling2016-11-151-82/+74
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'grapify-merge-request-api' into 'master' Rémy Coutable2016-11-151-162/+110
|\ \ \ \ \ \
| * | | | | | Grapify the merge request APIgrapify-merge-request-apiRobert Schilling2016-11-151-162/+110
| |/ / / / /
* | | | | | Merge branch 'master-recursiveTree' into 'master' Douwe Maan2016-11-152-2/+4
|\ \ \ \ \ \
| * | | | | | Issue #4270: Recursive option for files through APIRebeca Méndez2016-11-122-2/+4
* | | | | | | Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-151-0/+12
|\ \ \ \ \ \ \
| * | | | | | | Add button to delete all merged branchesToon Claes2016-11-091-0/+12
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' Douwe Maan2016-11-151-5/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix Error 500 when creating a merge request that contains an image that was d...stanhu/gitlab-ce-fix-error-500-with-mr-imagesStan Hu2016-11-141-5/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix_saml_ldap_link' into 'master' Douwe Maan2016-11-151-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Omniauth auto link LDAP user falls back to find by DN when user cannot be fou...Drew Blessing2016-11-101-0/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Use declared_params helper in APIgrapify-declared-paramsRobert Schilling2016-11-1412-36/+20
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'grapify-to-h' into 'master' Rémy Coutable2016-11-143-7/+9
|\ \ \ \ \ \
| * | | | | | Use #to_h to convert params to a hashgrapify-to-hRobert Schilling2016-11-143-7/+9
| |/ / / / /
* | | | | | Merge branch 'fix/improve-naming-convention-in-ci-config' into 'master' Kamil Trzciński2016-11-1430-106/+104
|\ \ \ \ \ \
View Lorry Controller Status