| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Don't render inline math when dollar signs are inside markupinline-math-dollar | Douwe Maan | 2016-12-22 | 1 | -0/+7 |
| | | |||||
| * | Merge branch '23638-remove-builds-tab' into 'master' | Kamil Trzciński | 2016-12-21 | 3 | -13/+11 |
| |\ | | | | | | | | | | | | | Resolve "Remove Builds tab from Merge Requests and Commits" Closes #23638 See merge request !7763 | ||||
| | * | Changes after review | Filipa Lacerda | 2016-12-21 | 1 | -5/+7 |
| | | | | | | | | | | | | | Fix broken test Remove spinach tests for the builds tab | ||||
| | * | Removes builds tab from merge request | Filipa Lacerda | 2016-12-21 | 2 | -8/+4 |
| | | | | | | | | | Fix specs | ||||
| * | | Merge branch 'adam-auto-deploy' into 'master' | Kamil Trzciński | 2016-12-21 | 1 | -0/+64 |
| |\ \ | | | | | | | | | | | | | | | | | | | Auto deploy Closes #23580 See merge request !8135 | ||||
| | * | | Revert conflicting EE changes | Kamil Trzcinski | 2016-12-21 | 8 | -22/+30 |
| | | | | |||||
| | * | | Added Autodeploy script for OpenShift | Kamil Trzcinski | 2016-12-21 | 1 | -2/+2 |
| | | | | |||||
| | * | | Introduce "Set up autodeploy" button to help configure GitLab CI for deploymentadam-auto-deploy | Adam Niedzielski | 2016-12-21 | 8 | -21/+77 |
| | |/ | | | | | | | | | | | 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 | -0/+14 |
| | | | |||||
| * | | 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 '25879-emoji-autocomplete-starts-too-eagerly' into 'master' | Jacob Schatz | 2016-12-21 | 1 | -11/+16 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix space issue and add test Closes #25879 See merge request !8217 | ||||
| | * | | | Fix space issue and add test25879-emoji-autocomplete-starts-too-eagerly | Luke "Jared" Bennett | 2016-12-21 | 1 | -11/+16 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'zj-mattermost-slash-config' into 'master' | Kamil Trzciński | 2016-12-21 | 7 | -15/+371 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070 | ||||
| | * | | | Add new tests | Z.J. van de Weg | 2016-12-21 | 3 | -1/+54 |
| | | | | | |||||
| | * | | | Improve API specs | Kamil Trzcinski | 2016-12-21 | 3 | -49/+203 |
| | | | | | |||||
| | * | | | Fix a few error messages | Kamil Trzcinski | 2016-12-20 | 1 | -3/+1 |
| | | | | | |||||
| | * | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵ | Kamil Trzcinski | 2016-12-20 | 5 | -37/+86 |
| | |\ \ \ | | | | | | | | | | | | | | | | into zj-mattermost-slash-config | ||||
| | | * | | | Add controller test | Z.J. van de Weg | 2016-12-20 | 1 | -0/+53 |
| | | | | | | |||||
| | | * | | | Fix rspec tests due to different API | Z.J. van de Weg | 2016-12-20 | 4 | -34/+31 |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | | * | | | Fix rubocop errors [ci skip] | Z.J. van de Weg | 2016-12-20 | 2 | -4/+3 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 35 | -606/+2309 |
| | |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵ | Kamil Trzcinski | 2016-12-20 | 1 | -35/+5 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | into zj-mattermost-slash-config | ||||
| | | * | | | | Fix tests | Luke "Jared" Bennett | 2016-12-20 | 1 | -35/+5 |
| | | | | | | | |||||
| | * | | | | | WIP | Kamil Trzcinski | 2016-12-20 | 2 | -11/+9 |
| | | | | | | | |||||
| | * | | | | | Work on tests for mattermost | Kamil Trzcinski | 2016-12-20 | 1 | -0/+35 |
| | | | | | | | |||||
| | * | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 50 | -254/+752 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | | Last fixes | Z.J. van de Weg | 2016-12-19 | 1 | -12/+12 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-19 | 6 | -1/+168 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into ↵ | Z.J. van de Weg | 2016-12-19 | 4 | -32/+81 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | zj-mattermost-slash-config | ||||
| | | * | | | | | | Added integration tests | Luke "Jared" Bennett | 2016-12-19 | 1 | -14/+53 |
| | | | | | | | | | |||||
| | | * | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 4 | -16/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 5 | -31/+45 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | * | | | | | | Merge branch 'master' into 'zj-mattermost-slash-config' | Zeger-Jan van de Weg | 2016-12-18 | 90 | -457/+2413 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/gitlab.yml.example # lib/mattermost/session.rb # spec/lib/mattermost/session_spec.rb | ||||
| | * | | | | | | | Add tests for auto configure slash commands | Z.J. van de Weg | 2016-12-16 | 5 | -8/+61 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-16 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Improve session tests | Z.J. van de Weg | 2016-12-15 | 2 | -42/+68 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Setup mattermost session | Z.J. van de Weg | 2016-12-12 | 1 | -0/+42 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add auto configure of commands | Z.J. van de Weg | 2016-12-16 | 1 | -0/+19 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Improve session tests | Z.J. van de Weg | 2016-12-16 | 2 | -42/+68 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Setup mattermost session | Z.J. van de Weg | 2016-12-16 | 1 | -0/+42 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'fix/group-path-rename-error' into 'master' | Douwe Maan | 2016-12-21 | 2 | -7/+65 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error 500 renaming group. Also added specs and changelog. Closes #17922 and #23223 See merge request !8201 | ||||
| | * | | | | | | | | | added more specs | James Lopez | 2016-12-21 | 2 | -4/+6 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fix error 500 renaming group. Also added specs and changelog. | James Lopez | 2016-12-20 | 2 | -7/+63 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch '25561-maintain-milestone-filter-param' into 'master' | Fatih Acet | 2016-12-21 | 2 | -0/+89 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent erasing Milestone filter when updating other filters Closes #25561 See merge request !8117 | ||||
| | * | | | | | | | | | | Maintain milestone filter option when updating filter25561-maintain-milestone-filter-param | Sam Rose | 2016-12-21 | 2 | -0/+89 |
| | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setup teaspoon tests for Issuable | ||||
| * | | | | | | | | | | Merge branch 'multipart-uploaded-file' into 'master' | Rémy Coutable | 2016-12-21 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inject ::UploadedFile from Multipart middleware Closes #25888 See merge request !8215 | ||||
| | * | | | | | | | | | Inject ::UploadedFile from Multipart middleware | Jacob Vosmaer | 2016-12-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+5 |
| | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |