| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fix guard stylebugfix/outlook-language-parsing | http://jneen.net/ | 2016-12-22 | 1 | -1/+3 |
| | | |||||
| * | Be more certain in the comment | http://jneen.net/ | 2016-12-21 | 1 | -2/+3 |
| | | |||||
| * | Revert "allow empty-quotes" | http://jneen.net/ | 2016-12-21 | 1 | -0/+4 |
| | | | | | This reverts commit 4f2f678aff8d7dfcac96c47cf7eb480a5707ddaf. | ||||
| * | remove comment attribution | http://jneen.net/ | 2016-12-21 | 1 | -1/+1 |
| | | |||||
| * | allow empty-quotes | http://jneen.net/ | 2016-12-21 | 1 | -4/+0 |
| | | |||||
| * | protect against EmailReplyTrimmer returning nil | http://jneen.net/ | 2016-12-21 | 1 | -1/+1 |
| | | |||||
| * | remove trailing whitespace from email bodies | http://jneen.net/ | 2016-12-21 | 1 | -0/+3 |
| | | |||||
| * | switch to email_reply_trimmer from discourse | http://jneen.net/ | 2016-12-21 | 1 | -26/+4 |
| | | |||||
| * | Merge branch '25908-fix-grape-after-update' into 'master' | Yorick Peterse | 2016-12-21 | 1 | -2/+2 |
| |\ | | | | | | | | | Use Grape's new Route methods See merge request !8223 | ||||
| | * | Use Grape's new Route methods25908-fix-grape-after-update | Rémy Coutable | 2016-12-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | - Use Route#request_method instead of Route#route_method - Use Route#path instead of Route#route_path Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch 'zj-mattermost-slash-config' into 'master' | Kamil Trzciński | 2016-12-21 | 5 | -9/+115 |
| |\ \ | | | | | | | | | | | | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070 | ||||
| | * | | Improve API specs | Kamil Trzcinski | 2016-12-21 | 1 | -14/+18 |
| | | | | |||||
| | * | | Fix a few error messages | Kamil Trzcinski | 2016-12-20 | 2 | -4/+4 |
| | | | | |||||
| | * | | Use separate file for error.rb | Kamil Trzcinski | 2016-12-20 | 1 | -2/+0 |
| | | | | |||||
| | * | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵ | Kamil Trzcinski | 2016-12-20 | 2 | -3/+3 |
| | |\ \ | | | | | | | | | | | | | into zj-mattermost-slash-config | ||||
| | | * | | Fix rspec tests due to different API | Z.J. van de Weg | 2016-12-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | | * | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵ | Z.J. van de Weg | 2016-12-20 | 2 | -8/+35 |
| | | |\ \ | | | | | | | | | | | | | | | | into zj-mattermost-slash-config | ||||
| | | * | | | Fix rubocop errors [ci skip] | Z.J. van de Weg | 2016-12-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 15 | -156/+271 |
| | |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Add missing Mattermost::Error | Kamil Trzcinski | 2016-12-20 | 1 | -0/+3 |
| | | | | | | |||||
| | * | | | | Add with_lease to session [ci skip] | Kamil Trzcinski | 2016-12-20 | 1 | -8/+32 |
| | | |/ / | |/| | | |||||
| | * | | | WIP | Kamil Trzcinski | 2016-12-20 | 2 | -14/+14 |
| | | | | | |||||
| | * | | | Work on tests for mattermost | Kamil Trzcinski | 2016-12-20 | 2 | -3/+17 |
| | | | | | |||||
| | * | | | Fix Mattermost client | Kamil Trzcinski | 2016-12-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 20 | -43/+159 |
| | |\ \ \ | |||||
| | * | | | | Fix flow | Kamil Trzcinski | 2016-12-20 | 3 | -21/+46 |
| | | | | | | |||||
| | * | | | | Improve sources | Kamil Trzcinski | 2016-12-19 | 3 | -7/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add proper error handling, - Use flash[:alert] and flash[:notice], - Use `resource` instead of `resources`, | ||||
| | * | | | | Last fixes | Z.J. van de Weg | 2016-12-19 | 1 | -4/+0 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-19 | 11 | -14/+124 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into ↵ | Z.J. van de Weg | 2016-12-19 | 1 | -3/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | zj-mattermost-slash-config | ||||
| | | * | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 3 | -20/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 3 | -24/+17 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | | Merge branch 'master' into 'zj-mattermost-slash-config' | Zeger-Jan van de Weg | 2016-12-18 | 44 | -325/+1120 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/gitlab.yml.example # lib/mattermost/session.rb # spec/lib/mattermost/session_spec.rb | ||||
| | * | | | | | | Incorporate review | Z.J. van de Weg | 2016-12-16 | 1 | -12/+0 |
| | | | | | | | | |||||
| | * | | | | | | Add tests for auto configure slash commands | Z.J. van de Weg | 2016-12-16 | 2 | -7/+15 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-16 | 2 | -17/+15 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Ensure the session is destroyed | Z.J. van de Weg | 2016-12-15 | 1 | -3/+5 |
| | | | | | | | | | |||||
| | | * | | | | | | Improve session tests | Z.J. van de Weg | 2016-12-15 | 1 | -3/+6 |
| | | | | | | | | | |||||
| | | * | | | | | | Setup mattermost session | Z.J. van de Weg | 2016-12-12 | 1 | -0/+102 |
| | | | | | | | | | |||||
| | * | | | | | | | Add auto configure of commands | Z.J. van de Weg | 2016-12-16 | 3 | -14/+23 |
| | | | | | | | | | |||||
| | * | | | | | | | Base work for auto config MM slash commands | Z.J. van de Weg | 2016-12-16 | 3 | -2/+47 |
| | | | | | | | | | |||||
| | * | | | | | | | Improve session tests | Z.J. van de Weg | 2016-12-16 | 1 | -3/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Setup mattermost session | Z.J. van de Weg | 2016-12-16 | 1 | -0/+102 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'fix/group-path-rename-error' into 'master' | Douwe Maan | 2016-12-21 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error 500 renaming group. Also added specs and changelog. Closes #17922 and #23223 See merge request !8201 | ||||
| | * | | | | | | | | Fix error 500 renaming group. Also added specs and changelog. | James Lopez | 2016-12-20 | 1 | -0/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'multipart-uploaded-file' into 'master' | Rémy Coutable | 2016-12-21 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inject ::UploadedFile from Multipart middleware Closes #25888 See merge request !8215 | ||||
| | * | | | | | | | | Inject ::UploadedFile from Multipart middleware | Jacob Vosmaer | 2016-12-21 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I mistakenly concluded Rack::Multipart injects File instances into the params. These should be UploadedFile instances. This reuses a mock UploadedFile class we already had in GitLab. | ||||
| * | | | | | | | | | Merge branch '25895-fix-headers-in-ci-api-helpers' into 'master' | Kamil Trzciński | 2016-12-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure nil User-Agent doesn't break the CI API Closes #25895 See merge request !8213 | ||||
| | * | | | | | | | | | Ensure nil User-Agent doesn't break the CI API | Rémy Coutable | 2016-12-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | | | Fix error importing label priorities and added relevant spec | James Lopez | 2016-12-21 | 1 | -5/+23 |
| |/ / / / / / / / / | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |