summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* This will ensure previous assignee gets an email even if his notif level is "...fix-consider-re-assign-as-a-mentionRémy Coutable2016-01-152-5/+44
* Add changelog entry for fix-consider-re-assign-as-a-mentionRémy Coutable2016-01-151-0/+1
* Consider re-assign as a mention from a notification point of viewRémy Coutable2016-01-152-6/+28
* Merge branch 'deleting-a-note-after-editing-another-results-in-a-javascript-e...Robert Speicher2016-01-151-4/+5
|\
| * Fix javascript error with deleting messages in issue or merge requestdeleting-a-note-after-editing-another-results-in-a-javascript-errorJacob Schatz2016-01-141-4/+5
* | Update CHANGELOGRobert Speicher2016-01-141-3/+1
* | Merge branch 'rs-woff2' into 'master' Robert Speicher2016-01-1413-4/+20
|\ \
| * | Prefer custom WOFF2 fonts if the browser supports themRobert Speicher2016-01-1413-4/+20
|/ /
* | Merge branch 'ci/api-triggers' into 'master' Kamil Trzciński2016-01-148-6/+326
|\ \ | |/ |/|
| * Update CHANGELOGci/api-triggersTomasz Maczukin2016-01-141-2/+1
| * Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-14217-1063/+3225
| |\
| * | Modify entry in CHANGELOGTomasz Maczukin2016-01-141-1/+1
| * | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-1420-10/+463
| |\ \
| * | | Fix versionTomasz Maczukin2016-01-141-1/+1
| * | | Merge branch 'master' into ci/api-triggersTomasz Maczukin2016-01-1454-230/+931
| |\ \ \
| * | | | Add mofications to triggers API documentation [ci skip]Tomasz Maczukin2016-01-141-32/+12
| * | | | Update CHANGELOG [ci skip]Tomasz Maczukin2016-01-141-0/+1
| * | | | Merge branch '8-4-stable' into ci/api-triggersTomasz Maczukin2016-01-14430-2642/+4839
| |\ \ \ \
| * | | | | Modify triggers API documentation style [ci skip]Tomasz Maczukin2016-01-143-91/+129
| * | | | | Add some fixes after reviewTomasz Maczukin2016-01-134-19/+16
| * | | | | Change 'trigger_id' to 'token' as resource ID in triggers APITomasz Maczukin2016-01-074-54/+27
| * | | | | Update ./doc/apiTomasz Maczukin2016-01-072-0/+95
| * | | | | Get show details feature to triggers APITomasz Maczukin2016-01-052-5/+77
| * | | | | Add create feature to triggers APITomasz Maczukin2016-01-052-0/+45
| * | | | | Add delete feature to triggers APITomasz Maczukin2016-01-052-0/+52
| * | | | | Fix ci_trigger_request factoryTomasz Maczukin2016-01-051-1/+1
| * | | | | Add triggers feature to APITomasz Maczukin2016-01-044-4/+71
* | | | | | Merge branch 'fixes-new-layout' into 'master' Dmitriy Zaporozhets2016-01-142-35/+39
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | add missing padding for commit -> builds pageDmitriy Zaporozhets2016-01-141-1/+2
| * | | | | Fix layout for empty projectDmitriy Zaporozhets2016-01-141-34/+37
* | | | | | Merge branch 'notification-btn-in-left-field' into 'master' Drew Blessing2016-01-141-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fixes margin and paddingJacob Schatz2016-01-141-1/+1
|/ / / / /
* | | | | Merge branch 'diff-parse-first-commit' into 'master'Robert Speicher2016-01-142-2/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into diff-parse-first-commitdiff-parse-first-commitDouwe Maan2016-01-1420-10/+463
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Properly generate diff of orphan commits, like the first commit in a repositoryDouwe Maan2016-01-142-2/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'backport-ee' into 'master' Robert Speicher2016-01-1443-70/+1
|\ \ \ \ \
| * | | | | Param should be present, not just truthybackport-eeDouwe Maan2016-01-141-1/+1
| * | | | | Prevent circular reference error in BanzaiDouwe Maan2016-01-1442-69/+0
* | | | | | Merge branch 'rs-fix-cross-reference' into 'master' Robert Speicher2016-01-142-3/+9
|\ \ \ \ \ \
| * | | | | | centering copy buttonrs-fix-cross-referenceJacob Schatz2016-01-131-0/+1
| * | | | | | Fix cross-project reference clipboard textRobert Speicher2016-01-132-4/+9
* | | | | | | Merge branch 'update_mail_docs' into 'master' Drew Blessing2016-01-142-3/+15
|\ \ \ \ \ \ \
| * | | | | | | Update mailroom/postfix documentation [ci skip]Drew Blessing2016-01-142-3/+15
* | | | | | | | Merge branch 'ui-fixes' into 'master' Dmitriy Zaporozhets2016-01-149-112/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix css mess around git clone panel. Align it properlyDmitriy Zaporozhets2016-01-145-104/+60
| * | | | | | | | Fix missing padding for user/group pagesDmitriy Zaporozhets2016-01-144-8/+0
* | | | | | | | | Merge branch 'ci/api-builds' into 'master' Douwe Maan2016-01-149-0/+724
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatusci/api-buildsTomasz Maczukin2016-01-143-5/+3
| * | | | | | | | Merge branch 'master' into ci/api-buildsTomasz Maczukin2016-01-1473-240/+1394
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Remove hard-coded id from builds factoryTomasz Maczukin2016-01-141-2/+1