summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add `Group#add_*` convenience methodsrs-group-convenience-methodsRobert Speicher2015-08-0711-14/+30
| | | | Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
* Merge branch 'nicer-merge-conflicts-widget' into 'master' Dmitriy Zaporozhets2015-08-061-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split merge conflict messages on 2 lines Before ![Screenshot_2015-08-06_17.19.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a2757ca0a8f4acbf4152234e050b739e/Screenshot_2015-08-06_17.19.48.png) After ![Screenshot_2015-08-06_17.22.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/11eeab533f98f008fb9548c0eb039aa3/Screenshot_2015-08-06_17.22.58.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1107
| * Split merge conflict messages on 2 linesnicer-merge-conflicts-widgetDmitriy Zaporozhets2015-08-061-1/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'add-current-user-to-autocomplete' into 'master'Dmitriy Zaporozhets2015-08-064-2/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always add current user to autocomplete controller to support filter by "Me" ### What does this MR do? This MR always adds the current user to the autocomplete list of users. ### Why was this MR needed? Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list. ### What are the relevant issue numbers? Partial fix #2202 See merge request !1100
| * | Always add current user to autocomplete controller to support filter by "Me"Stan Hu2015-08-064-2/+28
| | | | | | | | | | | | Partial fix #2202
* | | Merge branch 'fix-namespace-move-dir' into 'master' Dmitriy Zaporozhets2015-08-061-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure old namespace directory exists before moving it Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #983 See merge request !1101
| * | | Ensure old namespace directory exists before moving itfix-namespace-move-dirDmitriy Zaporozhets2015-08-061-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'report-spam'Dmitriy Zaporozhets2015-08-0619-1/+231
|\ \ \ \
| * | | | Remove trailing linesreport-spamDmitriy Zaporozhets2015-08-061-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add tests for abuse report featureDmitriy Zaporozhets2015-08-065-0/+67
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Improve wording in abuse report formDmitriy Zaporozhets2015-08-062-5/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Remove selectbox from abuse form. Added pagination in admin areaDmitriy Zaporozhets2015-08-062-5/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add abuse report management in admin areaDmitriy Zaporozhets2015-08-065-0/+58
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Allow users to send abuse reportsDmitriy Zaporozhets2015-08-0610-1/+111
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'project-name' into 'master' Dmitriy Zaporozhets2015-08-064-3/+14
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project name to project head I felt that something was missing between the avatar and description. ![Screen_Shot_2015-08-06_at_15.11.41](https://gitlab.com/gitlab-org/gitlab-ce/uploads/35935d81950351118ffbc8002814e411/Screen_Shot_2015-08-06_at_15.11.41.png) cc @dzaporozhets See merge request !1106
| * | | Fix specDouwe Maan2015-08-061-2/+2
| | | |
| * | | Add project name to project headDouwe Maan2015-08-063-1/+12
| | | |
* | | | Merge branch 'update_changelog_from_stable' into 'master' Valery Sizov2015-08-061-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | update chnagelog See merge request !1096
| * | | update chnagelogupdate_changelog_from_stableValery Sizov2015-08-051-0/+3
| | | |
* | | | Merge branch 'fix-link-to-guide' into 'master'Douwe Maan2015-08-061-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Replace relative url with full path, remove old reference for indexes See merge request !1091
| * | | | Replace relative url with full path, remove old reference for indexesAchilleas Pipinellis2015-08-051-2/+2
| | | | | | | | | | | | | | | | | | | | Closes #2176 (gitlab.com)
* | | | | Merge branch 'remove-email-from-published-keys' into 'master'Douwe Maan2015-08-066-7/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only publish ssh key-type and key Now when requesting my keys; my emailadres is exposed. [My keys](https://gitlab.com/zj.keys) To prevent harvesting only key-type and the key itself are displayed instead of all data supplied when uploaded. See merge request !850
| * | | | | Only publish ssh key-type and keyZeger-Jan van de Weg2015-08-046-7/+33
| | | | | |
* | | | | | Merge branch 'tree-author-at-end' into 'master'Dmitriy Zaporozhets2015-08-062-6/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put author name at the end of a tree row Put author name at the end of a tree row as the commit message is more important than the author name. See merge request !579
| * | | | | | Put author name at the end of a tree rowSven Strickroth2015-08-052-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | | | | Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan2015-08-065-4/+37
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084
| * | | | | | Fix "Network" and "Graphs" pages for branches with encoded slashesStan Hu2015-08-023-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1359
| * | | | | | Fix errors deleting and creating branches with encoded slashesStan Hu2015-08-013-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1804
* | | | | | | Update stable branch in installation documentation. Fixes #2191Achilleas Pipinellis2015-08-051-2/+2
| | | | | | |
* | | | | | | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-0568-1069/+288
|\ \ \ \ \ \ \
| * | | | | | | Remove satellites from requirements docs and add CHANGELOGdrop-satellitesDmitriy Zaporozhets2015-08-052-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix merge request creation without branch selectedDmitriy Zaporozhets2015-08-052-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Improve tests to use real branches in merge requestsDmitriy Zaporozhets2015-08-044-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-04220-1477/+2983
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix merge api and specDmitriy Zaporozhets2015-08-042-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Remove satellites mention from architecture docDmitriy Zaporozhets2015-07-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Use real branches from test repoDmitriy Zaporozhets2015-07-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix some of testsDmitriy Zaporozhets2015-07-163-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix refresh serviceDmitriy Zaporozhets2015-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix ↵Dmitriy Zaporozhets2015-07-162-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reload with full diff link Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-1620-133/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Refactor compare and fetch logicDmitriy Zaporozhets2015-07-158-51/+36
| | | | | | | |
| * | | | | | | Implement update of ref when merge request code is reloadedDmitriy Zaporozhets2015-07-151-9/+18
| | | | | | | |
| * | | | | | | Implement merge from forks without satellitesDmitriy Zaporozhets2015-07-157-22/+62
| | | | | | | |
| * | | | | | | Fix application initializeDmitriy Zaporozhets2015-07-152-1/+5
| | | | | | | |
| * | | | | | | Remove satellitesDmitriy Zaporozhets2015-07-1535-844/+18
| | | | | | | |
| * | | | | | | Fetch reference from fork repo when create merge requestDmitriy Zaporozhets2015-07-152-0/+14
| | | | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-052-0/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'update_release_doc' into 'master' Dmitriy Zaporozhets2015-08-052-0/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update release doc See merge request !1097
| | * | | | | | | update release docValery Sizov2015-08-052-0/+2
| | | |/ / / / / | | |/| | | | |
View Lorry Controller Status