summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 7.13.5v7.13.5Valery Sizov2015-08-121-1/+1
|
* Merge branch '7-13-5-stable-candidate' into '7-13-stable' Valery Sizov2015-08-1219-289/+415
|\ | | | | | | | | | | | | 7-13-5-stable candidate See merge request !1145
| * update changelogValery Sizov2015-08-121-45/+4
| |
| * Fix file api tests7-13-5-stable-candidateDmitriy Zaporozhets2015-08-121-22/+8
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Revert "Fix editing files via API"Dmitriy Zaporozhets2015-08-121-26/+24
| | | | | | | | This reverts commit 7bde6ae540bab5c93a83bfe26102674adba0eab5.
| * Revert "Merge branch 'web-editor-rugged' into 'master'"Dmitriy Zaporozhets2015-08-127-13/+266
| | | | | | | | | | | | | | This reverts commit 5a1aa49b5533593dc4c6de82279fe44f5f15616c, reversing changes made to a675bea2c1c1d5d6923cb97b8714eb72d4e4ff9b. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Revert "Create and edit files in web editor via rugged"Dmitriy Zaporozhets2015-08-123-81/+14
| | | | | | | | | | | | This reverts commit 734a4ba87de7bc8cf152c5bc7f93ba04210b282d. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Revert "Fix adding new file to empty repo"Dmitriy Zaporozhets2015-08-121-1/+1
| | | | | | | | | | | | This reverts commit 27a158506e033acd7195acf91995c1574e122832. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Revert "Use rugged in web editor for base64 encoding"Dmitriy Zaporozhets2015-08-122-28/+34
| | | | | | | | This reverts commit 541133197be098732cdc14a12aa059e21cac3d71.
| * Revert "Create activity event and execute hooks on web editor commit"Dmitriy Zaporozhets2015-08-123-11/+3
| | | | | | | | This reverts commit 3d416f1682c5e6a6ac1ea7013f66bbd0d23b452c.
| * Revert "Make web editor work correctly after switch from satellites"Dmitriy Zaporozhets2015-08-125-7/+5
| | | | | | | | This reverts commit 435f680b897b892103fa157d4699dbb6d9ecf758.
| * Revert "Refactor web editor"Dmitriy Zaporozhets2015-08-126-120/+152
| | | | | | | | | | | | This reverts commit dfccb06dda344819989fa8d6a9a3c56c5ca0b65f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Remove changelog itemsDmitriy Zaporozhets2015-08-121-1/+45
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix conflict issueDmitriy Zaporozhets2015-08-121-2/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Revert "Merge branches inside one repository using rugged instead of satellites"Dmitriy Zaporozhets2015-08-123-62/+6
| | | | | | | | This reverts commit d24c40ec219d76e01e2fab5f6ebf431adae91bdd.
| * Revert "Merge branch 'refactor-can-be-merge' into 'master'"Dmitriy Zaporozhets2015-08-123-24/+7
|/ | | | | | | This reverts commit 459e6d346768d9d8fceaee00bf0870b8e7c4ed9a, reversing changes made to 804168e1def1204af712febb229f41a3865f085f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* 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 7-13-stable with 7.13.4 See merge request !1113
| * update changelogValery Sizov2015-08-071-11/+3
| |
| * Remove trailing linesDmitriy Zaporozhets2015-08-071-2/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add tests for abuse report featureDmitriy Zaporozhets2015-08-075-0/+67
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Improve wording in abuse report formDmitriy Zaporozhets2015-08-072-5/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Remove selectbox from abuse form. Added pagination in admin areaDmitriy Zaporozhets2015-08-072-5/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add abuse report management in admin areaDmitriy Zaporozhets2015-08-075-0/+58
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Allow users to send abuse reportsDmitriy Zaporozhets2015-08-0710-1/+121
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* 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 stable 7.13.3 See merge request !1088
| * update changelogValery Sizov2015-08-041-12/+2
| |
| * Fix bug causing Bitbucket importer to crash when OAuth application had been ↵Douwe Maan2015-08-043-6/+28
|/ | | | removed.
* 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 stable for 7.13.2 See merge request !1056
| * update changelogValery Sizov2015-07-281-12/+8
| |
| * Render Note field hints consistently for "new" and "edit" formsRobert Speicher2015-07-283-16/+12
| | | | | | | | | | | | | | | | | | | | - The "Edit" form didn't have Markdown hints. - The "New" form had a paperclip icon for attachments, the "edit" form didn't. Closes #2010 Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525
| * Remove docs and rake task for gmail actions to prevent problems with ↵Marin Jankovski2015-07-283-101/+0
| | | | | | | | registration.
| * 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
| | | | | | | | | | | | | | | | | | | | | | Starting with migration `20150717130904` commit count is stored in the database. For existing projects it defaults to `0` and is updated to the correct value when commits are pushed. The newly introduced rake task updates the commit count for all projects which have not been updated yet. Refs !986, !989, #2040.
| * Show the first tab automatically on MergeRequests#newRobert Speicher2015-07-281-3/+9
| | | | | | | | Closes #2013
| * Dynamically check `:admin_*` ability in IssuableBaseServiceRobert Speicher2015-07-283-2/+14
| | | | | | | | Closes #2092
| * Dynamically check `:admin_*` ability on issuable formRobert Speicher2015-07-281-1/+1
| | | | | | | | Closes #2092
| * Add Issuable#to_ability_nameRobert Speicher2015-07-282-2/+12
| |
| * Fix Error 500 when browsing projects with no HEADStan Hu2015-07-283-2/+35
| | | | | | | | | | | | | | | | | | | | Steps to reproduce: 1. Create a project with a README 2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere` 3. Check that HEAD is gone via `git ls-remote .` 4. Go to the projects page and see the Error 500 Closes https://github.com/gitlabhq/gitlabhq/issues/9484
| * 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
| | | | | | | | | | | | | | This was necessary because this permission is checked dynamically by `app/views/shared/issuable/_context` when on a Merge Request. Closes #2058
| * 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 spec https://gitlab.com/gitlab-org/gitlab-ce/issues/2069 See merge request !1035
| * 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 7-13-stable (7.13.1) See merge request !1033
| * update changelogValery Sizov2015-07-231-14/+1
| |
View Lorry Controller Status