summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated list of InfluxDB queries/confignew-list-of-influxdb-queriesYorick Peterse2016-04-201-28/+44
* Merge branch 'backport_changes_from_ee' into 'master' Dmitriy Zaporozhets2016-04-202-15/+12
|\
| * Backport select_helper from EEbackport_changes_from_eeValery Sizov2016-04-202-15/+12
* | Merge branch 'edit-link-anchor-stop' into 'master' Jacob Schatz2016-04-201-15/+24
|\ \
| * | Fixed issue with sidebar edit links toggling anchoredit-link-anchor-stopPhil Hughes2016-04-191-15/+24
* | | Merge branch 'issue_15366' into 'master' Jacob Schatz2016-04-201-1/+1
|\ \ \
| * | | Render relative timestamps for all commits in projects commit listissue_15366Felipe Artur2016-04-191-1/+1
* | | | Merge branch 'system-note-commented' into 'master' Jacob Schatz2016-04-201-1/+3
|\ \ \ \
| * | | | Removed commented text from system notesPhil Hughes2016-04-201-1/+3
* | | | | Merge branch 'new-mr-layout-fix' into 'master' Jacob Schatz2016-04-201-8/+12
|\ \ \ \ \
| * | | | | Fixed issue with new MR form layoutPhil Hughes2016-04-201-8/+12
| |/ / / /
* | | | | Merge branch 'note-form-text-color' into 'master' Jacob Schatz2016-04-201-0/+1
|\ \ \ \ \
| * | | | | Fixes issue with note form inheriting text colornote-form-text-colorPhil Hughes2016-04-201-0/+1
| |/ / / /
* | | | | Merge branch 'fix-mr-cherry-pick-without-merge-commit' into 'master' Yorick Peterse2016-04-205-7/+62
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add testsfix-mr-cherry-pick-without-merge-commitDouwe Maan2016-04-201-0/+44
| * | | | Also show Revert and Cherry-pick when the source branch can't be removedDouwe Maan2016-04-201-0/+5
| * | | | Verify the MR being displayed question has a merge commit set and can be cher...Douwe Maan2016-04-203-7/+13
|/ / / /
* | | | Merge branch 'feature/incremental-build-trace-update' into 'master' Rémy Coutable2016-04-206-22/+191
|\ \ \ \
| * | | | Fix Build#append_trace method usage when trace file doesn't exists yetTomasz Maczukin2016-04-202-3/+4
| * | | | Fix some typos in documentationTomasz Maczukin2016-04-202-5/+5
| * | | | Add documentation of incremental trace update APITomasz Maczukin2016-04-202-22/+89
| * | | | Update CHANGELOGTomasz Maczukin2016-04-201-0/+1
| * | | | Make sure that appending is done on a valid lengthTomasz Maczukin2016-04-203-6/+17
| * | | | Add range checkingTomasz Maczukin2016-04-204-11/+57
| * | | | Add incremental build trace update APITomasz Maczukin2016-04-203-1/+44
|/ / / /
* | | | Merge branch 'slack_wiki_notifications' into 'master' Rémy Coutable2016-04-2021-17/+263
|\ \ \ \
| * | | | Fix wiki testsSebastian Klier2016-04-204-1/+26
| * | | | Update changelogSebastian Klier2016-04-201-1/+1
| * | | | Fix test to conform to conventionsSebastian Klier2016-04-201-7/+8
| * | | | Fix testSebastian Klier2016-04-201-4/+4
| * | | | update changelogSebastian Klier2016-04-201-1/+1
| * | | | formatting and test structureSebastian Klier2016-04-203-28/+45
| * | | | add wiki_page helper to url_builderSebastian Klier2016-04-202-1/+8
| * | | | improve check if wiki page is persistedSebastian Klier2016-04-201-1/+1
| * | | | remove unnecessary methodsSebastian Klier2016-04-201-11/+0
| * | | | add slack notifications for wiki pagesSebastian Klier2016-04-2017-6/+213
* | | | | Merge branch 'feature/raw-trace-output' into 'master' Rémy Coutable2016-04-205-2/+45
|\ \ \ \ \
| * | | | | Improve and fix specs for raw tracefeature/raw-trace-outputTomasz Maczukin2016-04-191-4/+8
| * | | | | Use Rails-way to send file by X-SendfileTomasz Maczukin2016-04-191-5/+2
| * | | | | Update CHANGELOGTomasz Maczukin2016-04-191-0/+1
| * | | | | Add feature specs for raw traceTomasz Maczukin2016-04-193-2/+28
| * | | | | Switch raw trace to use X-Sendfile headerTomasz Maczukin2016-04-192-4/+7
| * | | | | Add raw trace output for GitLab WorkhorseTomasz Maczukin2016-04-193-1/+13
* | | | | | Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher2016-04-2027-146/+671
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Rename License entity to RepoLicense to avoid conflict with EElicense-templates-and-api-12804Rémy Coutable2016-04-192-3/+3
| * | | | | Fix specsRémy Coutable2016-04-184-19/+9
| * | | | | Update to licensee 8.0.0 and fix API specsRémy Coutable2016-04-184-12/+13
| * | | | | Fix features specs (hopefully)Rémy Coutable2016-04-182-4/+4
| * | | | | Continue implementation of the license template selector and /licenses API en...Rémy Coutable2016-04-1822-207/+588
| * | | | | Initial implementation if license template selector and /licenses/:key API en...Anton Davydov2016-04-1812-3/+156