| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix a Grape deprecation, use `#request_method` instead of `#route_method`fix-api-deprecation | Rémy Coutable | 2016-12-23 | 1 | -1/+1 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch 'zj-fix-issue-search-chat-command' into 'master' | Rémy Coutable | 2016-12-23 | 2 | -8/+9 |
| |\ | | | | | | | | | | | | | Fix errorcode 500 on slash commands Closes #26013 See merge request !8285 | ||||
| | * | Fix errorcode 500 on slash commandszj-fix-issue-search-chat-command | Z.J. van de Weg | 2016-12-23 | 2 | -8/+9 |
| | | | | | | | | | Coverage was failing, so this could slip through the cracks | ||||
| * | | Merge branch 'fixes-issues-api-reopen' into 'master' | Rémy Coutable | 2016-12-23 | 1 | -2/+1 |
| |\ \ | |/ |/| | | | | | | | | | Fix state_event parameter to reopen an issue Closes #25958 See merge request !8246 | ||||
| | * | Fix state_event parameter to reopen an issuefixes-issues-api-reopen | Robert Schilling | 2016-12-22 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'inline-math-dollar' into 'master' | Robert Speicher | 2016-12-22 | 1 | -8/+3 |
| |\ \ | | | | | | | | | | | | | Don't render inline math when dollar signs are inside markup See merge request !8259 | ||||
| | * | | Don't render inline math when dollar signs are inside markupinline-math-dollar | Douwe Maan | 2016-12-22 | 1 | -8/+3 |
| | |/ | |||||
| * | | Merge branch 'cache-last-commit-sha-for-path' into 'master' | Yorick Peterse | 2016-12-22 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | Cache last commit id for path See merge request !8098 | ||||
| | * | | Merge two methods. | Hiroyuki Sato | 2016-12-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Rename sha to id | Hiroyuki Sato | 2016-12-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Use Repository#cache_last_commit_sha_for_path in API | Hiroyuki Sato | 2016-12-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use `ref` variable24224-fix-project-ref-cache | Douwe Maan | 2016-12-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix lookup of project by unknown ref when caching is enabled | Douwe Maan | 2016-12-22 | 1 | -4/+15 |
| | |/ |/| | |||||
| * | | Merge branch 'adam-auto-deploy' into 'master' | Kamil Trzciński | 2016-12-21 | 1 | -2/+8 |
| |\ \ | | | | | | | | | | | | | | | | | | | Auto deploy Closes #23580 See merge request !8135 | ||||
| | * | | Introduce "Set up autodeploy" button to help configure GitLab CI for deploymentadam-auto-deploy | Adam Niedzielski | 2016-12-21 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | The button allows to choose a ".gitlab-ci.yml" template that automatically sets up the deployment of an application. The currently supported template is Kubernetes template. | ||||
| * | | | Filter protocol-relative URLs in ExternalLinkFilter. Fixes issue #22742. | Makoto Scott-Hinkle | 2016-12-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 |
| | | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |