Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updated list of InfluxDB queries/confignew-list-of-influxdb-queries | Yorick Peterse | 2016-04-20 | 1 | -28/+44 |
* | Merge branch 'backport_changes_from_ee' into 'master' | Dmitriy Zaporozhets | 2016-04-20 | 2 | -15/+12 |
|\ | |||||
| * | Backport select_helper from EEbackport_changes_from_ee | Valery Sizov | 2016-04-20 | 2 | -15/+12 |
* | | Merge branch 'edit-link-anchor-stop' into 'master' | Jacob Schatz | 2016-04-20 | 1 | -15/+24 |
|\ \ | |||||
| * | | Fixed issue with sidebar edit links toggling anchoredit-link-anchor-stop | Phil Hughes | 2016-04-19 | 1 | -15/+24 |
* | | | Merge branch 'issue_15366' into 'master' | Jacob Schatz | 2016-04-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Render relative timestamps for all commits in projects commit listissue_15366 | Felipe Artur | 2016-04-19 | 1 | -1/+1 |
* | | | | Merge branch 'system-note-commented' into 'master' | Jacob Schatz | 2016-04-20 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | 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 | 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 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 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | 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 cher... | Douwe Maan | 2016-04-20 | 3 | -7/+13 |
|/ / / / | |||||
* | | | | Merge branch 'feature/incremental-build-trace-update' into 'master' | Rémy Coutable | 2016-04-20 | 6 | -22/+191 |
|\ \ \ \ | |||||
| * | | | | 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 |
| * | | | | Add documentation of incremental trace update API | Tomasz Maczukin | 2016-04-20 | 2 | -22/+89 |
| * | | | | Update CHANGELOG | Tomasz Maczukin | 2016-04-20 | 1 | -0/+1 |
| * | | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 |
* | | | | | Merge branch 'feature/raw-trace-output' into 'master' | Rémy Coutable | 2016-04-20 | 5 | -2/+45 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Rename License entity to RepoLicense to avoid conflict with EElicense-templates-and-api-12804 | Rémy Coutable | 2016-04-19 | 2 | -3/+3 |
| * | | | | | Fix specs | Rémy Coutable | 2016-04-18 | 4 | -19/+9 |
| * | | | | | Update to licensee 8.0.0 and fix API specs | Rémy Coutable | 2016-04-18 | 4 | -12/+13 |
| * | | | | | Fix features specs (hopefully) | Rémy Coutable | 2016-04-18 | 2 | -4/+4 |
| * | | | | | Continue implementation of the license template selector and /licenses API en... | Rémy Coutable | 2016-04-18 | 22 | -207/+588 |
| * | | | | | Initial implementation if license template selector and /licenses/:key API en... | Anton Davydov | 2016-04-18 | 12 | -3/+156 |