| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Wrap all code in diffsrevert-diff-scroll | Annabel Dunstone | 2016-04-20 | 5 | -30/+20 |
| | | |||||
| * | Merge branch 'system-note-commented' into 'master' | Jacob Schatz | 2016-04-20 | 1 | -1/+3 |
| |\ | | | | | | | | | | | | | Removed commented text from system notes  See merge request !3836 | ||||
| | * | Removed commented text from system notes | Phil Hughes | 2016-04-20 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'new-mr-layout-fix' into 'master' | Jacob Schatz | 2016-04-20 | 1 | -8/+12 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with new MR form layout Currently it is all over the place:  Now:  See merge request !3837 | ||||
| | * | | Fixed issue with new MR form layout | Phil Hughes | 2016-04-20 | 1 | -8/+12 |
| | |/ | |||||
| * | | Merge branch 'note-form-text-color' into 'master' | Jacob Schatz | 2016-04-20 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with note form inheriting text color It was only really noticeable on dark themed diffs  See merge request !3834 | ||||
| | * | | Fixes issue with note form inheriting text colornote-form-text-color | Phil Hughes | 2016-04-20 | 1 | -0/+1 |
| | |/ | |||||
| * | | Merge branch 'fix-mr-cherry-pick-without-merge-commit' into 'master' | Yorick Peterse | 2016-04-20 | 5 | -7/+62 |
| |\ \ | |/ |/| | | | | | Verify the MR being displayed question has a merge commit set and can be cherry-picked See merge request !3830 | ||||
| | * | Add testsfix-mr-cherry-pick-without-merge-commit | Douwe Maan | 2016-04-20 | 1 | -0/+44 |
| | | | |||||
| | * | Also show Revert and Cherry-pick when the source branch can't be removed | Douwe Maan | 2016-04-20 | 1 | -0/+5 |
| | | | |||||
| | * | Verify the MR being displayed question has a merge commit set and can be ↵ | Douwe Maan | 2016-04-20 | 3 | -7/+13 |
| |/ | | | | cherry-picked | ||||
| * | Merge branch 'feature/incremental-build-trace-update' into 'master' | Rémy Coutable | 2016-04-20 | 6 | -22/+191 |
| |\ | | | | | | | | | | | | | | | | | Add incremental build trace update API Closes #14537 Must be merged if we want changes from gitlab-org/gitlab-ci-multi-runner!124 to work. See merge request !3447 | ||||
| | * | Fix Build#append_trace method usage when trace file doesn't exists yet | Tomasz Maczukin | 2016-04-20 | 2 | -3/+4 |
| | | | |||||
| | * | Fix some typos in documentation | Tomasz Maczukin | 2016-04-20 | 2 | -5/+5 |
| | | | | | | | | | [ci skip] | ||||
| | * | Add documentation of incremental trace update API | Tomasz Maczukin | 2016-04-20 | 2 | -22/+89 |
| | | | | | | | | | [ci skip] | ||||
| | * | Update CHANGELOG | Tomasz Maczukin | 2016-04-20 | 1 | -0/+1 |
| | | | | | | | | | [ci skip] | ||||
| | * | Make sure that appending is done on a valid length | Tomasz Maczukin | 2016-04-20 | 3 | -6/+17 |
| | | | |||||
| | * | Add range checking | Tomasz Maczukin | 2016-04-20 | 4 | -11/+57 |
| | | | |||||
| | * | Add incremental build trace update API | Tomasz Maczukin | 2016-04-20 | 3 | -1/+44 |
| |/ | |||||
| * | Merge branch 'slack_wiki_notifications' into 'master' | Rémy Coutable | 2016-04-20 | 21 | -17/+263 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add slack notifications for wiki pages ## What does this MR do? Lets the Slack service be configured to send notifications when wiki pages are created or edited. ## Are there points in the code the reviewer needs to double check? I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :) ## Why was this MR needed? Related to #563 and fixes #4233. See merge request !2998 | ||||
| | * | Fix wiki tests | Sebastian Klier | 2016-04-20 | 4 | -1/+26 |
| | | | |||||
| | * | Update changelog | Sebastian Klier | 2016-04-20 | 1 | -1/+1 |
| | | | |||||
| | * | Fix test to conform to conventions | Sebastian Klier | 2016-04-20 | 1 | -7/+8 |
| | | | |||||
| | * | Fix test | Sebastian Klier | 2016-04-20 | 1 | -4/+4 |
| | | | |||||
| | * | update changelog | Sebastian Klier | 2016-04-20 | 1 | -1/+1 |
| | | | |||||
| | * | formatting and test structure | Sebastian Klier | 2016-04-20 | 3 | -28/+45 |
| | | | |||||
| | * | add wiki_page helper to url_builder | Sebastian Klier | 2016-04-20 | 2 | -1/+8 |
| | | | |||||
| | * | improve check if wiki page is persisted | Sebastian Klier | 2016-04-20 | 1 | -1/+1 |
| | | | |||||
| | * | remove unnecessary methods | Sebastian Klier | 2016-04-20 | 1 | -11/+0 |
| | | | |||||
| | * | add slack notifications for wiki pages | Sebastian Klier | 2016-04-20 | 17 | -6/+213 |
| | | | | | | | | | update changelog | ||||
| * | | Merge branch 'feature/raw-trace-output' into 'master' | Rémy Coutable | 2016-04-20 | 5 | -2/+45 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add raw build trace output Closes #15308, #15147 Changes in the UI: - on finished build:  - on running build:  See merge request !3767 | ||||
| | * | | Improve and fix specs for raw tracefeature/raw-trace-output | Tomasz Maczukin | 2016-04-19 | 1 | -4/+8 |
| | | | | |||||
| | * | | Use Rails-way to send file by X-Sendfile | Tomasz Maczukin | 2016-04-19 | 1 | -5/+2 |
| | | | | |||||
| | * | | Update CHANGELOG | Tomasz Maczukin | 2016-04-19 | 1 | -0/+1 |
| | | | | |||||
| | * | | Add feature specs for raw trace | Tomasz Maczukin | 2016-04-19 | 3 | -2/+28 |
| | | | | |||||
| | * | | Switch raw trace to use X-Sendfile header | Tomasz Maczukin | 2016-04-19 | 2 | -4/+7 |
| | | | | |||||
| | * | | Add raw trace output for GitLab Workhorse | Tomasz Maczukin | 2016-04-19 | 3 | -1/+13 |
| | | | | |||||
| * | | | Merge branch 'license-templates-and-api-12804' into 'master' | Robert Speicher | 2016-04-20 | 27 | -146/+671 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660 | ||||
| | * | | Rename License entity to RepoLicense to avoid conflict with EElicense-templates-and-api-12804 | Rémy Coutable | 2016-04-19 | 2 | -3/+3 |
| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | Fix specs | Rémy Coutable | 2016-04-18 | 4 | -19/+9 |
| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | Update to licensee 8.0.0 and fix API specs | Rémy Coutable | 2016-04-18 | 4 | -12/+13 |
| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | Fix features specs (hopefully) | Rémy Coutable | 2016-04-18 | 2 | -4/+4 |
| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | Continue implementation of the license template selector and /licenses API ↵ | Rémy Coutable | 2016-04-18 | 22 | -207/+588 |
| | | | | | | | | | | | | | | | | | | | endpoint Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | Initial implementation if license template selector and /licenses/:key API ↵ | Anton Davydov | 2016-04-18 | 12 | -3/+156 |
| | | | | | | | | | | | | | endpoint | ||||
| * | | | Merge branch 'issue_15390' into 'master' | Robert Speicher | 2016-04-19 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix javascript errors with invalid json because of commas fixes #15390 See merge request !3827 | ||||
| | * | | | Fix javascript errors with invalid json because of commas | Felipe Artur | 2016-04-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update CHANGELOG | Robert Speicher | 2016-04-19 | 1 | -1/+3 |
| | |_|/ |/| | | | | | | | | [ci skip] | ||||
| * | | | Merge remote-tracking branch 'dev/master' into 'master' | Robert Speicher | 2016-04-19 | 2 | -7/+7 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'rs-label-xss' into 'master' | Jacob Schatz | 2016-04-19 | 2 | -7/+7 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove XSS vulnerability in Label and Milestone dropdowns Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15389 See merge request !1951 | ||||
| | | * | | | Remove XSS vulnerability in Label and Milestone dropdowns | Robert Speicher | 2016-04-19 | 2 | -7/+7 |
| | |/ / / | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |