summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix file api tests7-13-5-stable-candidateDmitriy Zaporozhets2015-08-121-22/+8
* Revert "Fix editing files via API"Dmitriy Zaporozhets2015-08-121-26/+24
* Revert "Merge branch 'web-editor-rugged' into 'master'"Dmitriy Zaporozhets2015-08-127-13/+266
* Revert "Create and edit files in web editor via rugged"Dmitriy Zaporozhets2015-08-123-81/+14
* Revert "Fix adding new file to empty repo"Dmitriy Zaporozhets2015-08-121-1/+1
* Revert "Use rugged in web editor for base64 encoding"Dmitriy Zaporozhets2015-08-122-28/+34
* Revert "Create activity event and execute hooks on web editor commit"Dmitriy Zaporozhets2015-08-123-11/+3
* Revert "Make web editor work correctly after switch from satellites"Dmitriy Zaporozhets2015-08-125-7/+5
* Revert "Refactor web editor"Dmitriy Zaporozhets2015-08-126-120/+152
* Remove changelog itemsDmitriy Zaporozhets2015-08-121-1/+45
* Fix conflict issueDmitriy Zaporozhets2015-08-121-2/+0
* Revert "Merge branches inside one repository using rugged instead of satellites"Dmitriy Zaporozhets2015-08-123-62/+6
* Revert "Merge branch 'refactor-can-be-merge' into 'master'"Dmitriy Zaporozhets2015-08-123-24/+7
* Version 7.13.4v7.13.4Valery Sizov2015-08-071-1/+1
* Merge branch 'update_7-13-stable' into '7-13-stable' Valery Sizov2015-08-0719-1/+233
|\
| * update changelogValery Sizov2015-08-071-11/+3
| * Remove trailing linesDmitriy Zaporozhets2015-08-071-2/+0
| * Add tests for abuse report featureDmitriy Zaporozhets2015-08-075-0/+67
| * Improve wording in abuse report formDmitriy Zaporozhets2015-08-072-5/+4
| * Remove selectbox from abuse form. Added pagination in admin areaDmitriy Zaporozhets2015-08-072-5/+3
| * Add abuse report management in admin areaDmitriy Zaporozhets2015-08-075-0/+58
| * Allow users to send abuse reportsDmitriy Zaporozhets2015-08-0710-1/+121
|/
* Version 7.13.3v7.13.3Valery Sizov2015-08-041-1/+1
* Merge branch 'update_stable' into '7-13-stable' Valery Sizov2015-08-043-6/+18
|\
| * update changelogValery Sizov2015-08-041-12/+2
| * Fix bug causing Bitbucket importer to crash when OAuth application had been r...Douwe Maan2015-08-043-6/+28
|/
* Version 7.13.2v7.13.2Valery Sizov2015-07-281-1/+1
* Merge branch 'update_stable-7-13' into '7-13-stable' Valery Sizov2015-07-2822-131/+116
|\
| * update changelogValery Sizov2015-07-281-12/+8
| * Render Note field hints consistently for "new" and "edit" formsRobert Speicher2015-07-283-16/+12
| * Remove docs and rake task for gmail actions to prevent problems with registra...Marin Jankovski2015-07-283-101/+0
| * Use mdash to prevent breaking html emails.Marin Jankovski2015-07-281-1/+1
| * Add rake task 'gitlab:update_commit_count'Daniel Gerhardt2015-07-282-0/+21
| * Show the first tab automatically on MergeRequests#newRobert Speicher2015-07-281-3/+9
| * Dynamically check `:admin_*` ability in IssuableBaseServiceRobert Speicher2015-07-283-2/+14
| * Dynamically check `:admin_*` ability on issuable formRobert Speicher2015-07-281-1/+1
| * Add Issuable#to_ability_nameRobert Speicher2015-07-282-2/+12
| * Fix Error 500 when browsing projects with no HEADStan Hu2015-07-283-2/+35
| * Add "Manage merge requests" permission to docsRobert Speicher2015-07-281-0/+1
| * Add admin_merge_request ability to Developer level and upRobert Speicher2015-07-281-1/+2
| * Create project services on Project creationRobert Speicher2015-07-282-0/+9
| * Only create :admin user in the one test where it's usedRobert Speicher2015-07-281-2/+3
|/
* Merge branch 'test_stabilize_stable' into '7-13-stable' Valery Sizov2015-07-231-0/+2
|\
| * fix randomly failed spectest_stabilize_stableValery Sizov2015-07-231-0/+2
|/
* Version 7.13.1v7.13.1Valery Sizov2015-07-231-1/+1
* Merge branch 'update-7-13-stable' into '7-13-stable' Valery Sizov2015-07-235-3/+17
|\
| * update changelogValery Sizov2015-07-231-14/+1
| * Return true/false from AutoMergeService#merge!Douwe Maan2015-07-231-0/+4
| * Fix Remove source-branch for MRs from same projectDouwe Maan2015-07-235-3/+25
| * update changelogValery Sizov2015-07-231-0/+1
|/