summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Trigger post-receive hoooks when commits are made by GitLabtrigger-hooksDmitriy Zaporozhets2015-08-102-2/+65
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'gravatar-host-link' into 'master'Stan Hu2015-08-091-2/+2
|\ | | | | | | | | | | | | | | link to configured gravatar host on profile page This MR updates the profile page to display the correct address for the configured gravatar service. Previously this always showed gravatar.com even if gravatar.com was not being used as the gravatar service. See merge request !1093
| * ink to configured gravatar host on profile pageBen Bodenmiller2015-08-051-2/+2
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-093-7/+11
|\ \
| * \ Merge branch 'ui-improvements' into 'master' Dmitriy Zaporozhets2015-08-093-7/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ui improvements * revert of wrong patch * spall margin change Explanation with screenshots here - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/579#note_1845510 See merge request !1117
| | * | Revert "Put author name at the end of a tree row"Dmitriy Zaporozhets2015-08-072-5/+6
| | | | | | | | | | | | | | | | This reverts commit ee0fc2c3ad9608db91175e082fe1f6da19a3aec7.
| | * | Add more spacing between MR widget and tabsDmitriy Zaporozhets2015-08-071-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-08-097-54/+48
|\ \ \ \ | |/ / /
| * | | Merge branch 'rs-fix-msapplication-tileimage' into 'master' Robert Speicher2015-08-091-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fix transparency for msapplication-tile image See merge request !1122
| | * | | Fix transparency for msapplication-tile imageRobert Speicher2015-08-081-0/+0
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Merge branch 'cache-events' into 'master' Robert Speicher2015-08-095-14/+39
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache all events Use CSS to determine if the current user needs to see "Congratulations! Tweet about it" by project creation events and "Create Merge Request" by push events. Implemented as described here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/911#note_1559710 Addresses #2054, in part. cc @dzaporozhets See merge request !1103
| | * | | Use display: inline where appropriatecache-eventsDouwe Maan2015-08-062-1/+9
| | | | |
| | * | | Cache all eventsDouwe Maan2015-08-065-14/+31
| | | | |
| * | | | Merge branch 'merge-notifs' into 'master'Robert Speicher2015-08-071-40/+9
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | See merge request !1077
| | * | | Merge branch 'master' into merge-notifsmerge-notifsDouwe Maan2015-08-0667-326/+481
| | |\ \ \ | | | |/ /
| | * | | Send notification to all participants when MR is merged.Douwe Maan2015-07-301-40/+9
| | | | |
* | | | | Improve abuse report wordingStefan Tatschner2015-08-081-1/+1
|/ / / /
* | | | Merge branch 'bitbucket-show-incompatible' into 'master'Douwe Maan2015-08-072-5/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show incompatible projects in Bitbucket import status ### What does this MR do? This MR displays incompatible Bitbucket projects (e.g. SVN, hg) in the status table. ### Why was this MR needed? Users are confused when they don't see projects show up. The import list should show incompatible projects as we do for Google Code to make it more obvious to the user what is happening. (See !586 and 9c76a6fa). ### Screenshot ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/264b080114c809c4a3a79580594af8b2/image.png) ### What are the relevant issue numbers? #1871 See merge request !1114
| * | | | Show incompatible projects in Bitbucket import statusStan Hu2015-08-072-5/+29
| | | | | | | | | | | | | | | | | | | | See #1871
* | | | | Merge branch 'improve-merge-requests' into 'master' Dmitriy Zaporozhets2015-08-0711-160/+113
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve merge requests - [x] Fetch merge request refs by IID - [x] Ability to fetch any merge request - [x] Link commits and diffs in merge request to target project - [x] Improve merge request UI and command line instructions - [x] Check merge request widget loading test coverage double See merge request !1115
| * | | | | Move command line insturction out of mr widgetDmitriy Zaporozhets2015-08-074-46/+30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Refactor merge request widgetDmitriy Zaporozhets2015-08-077-117/+86
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Link mr commits/diffs to target projectDmitriy Zaporozhets2015-08-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now when changes in merge requests stored in target project we can always link commits and diffs to target project. So even people without access to fork can browse commits and diffs Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Create ref for every merge request. Add documentation for fetch merge requestsDmitriy Zaporozhets2015-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Fetch to mr code from fork to iidDmitriy Zaporozhets2015-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'comment-updated-by' into 'master' Douwe Maan2015-08-0712-58/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show who last edited a comment if it wasn't the original author Fixes #1796. The `updated_by` user is also tracked for issues and merge requests, but it isn't currently shown, because "edited by Person" would give the idea that Person edited the description, while most updates to those are assignee/milestone/labels, in which case who made that change is already visible in the comments. See merge request !1075
| * \ \ \ \ \ Merge branch 'master' into comment-updated-bycomment-updated-byDouwe Maan2015-08-0716-11/+154
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge branch 'master' into comment-updated-byDouwe Maan2015-08-0666-322/+472
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'master' into comment-updated-byDouwe Maan2015-07-316-14/+22
| |\ \ \ \ \ \
| * | | | | | | Reset correct event cacheDouwe Maan2015-07-311-1/+1
| | | | | | | |
| * | | | | | | Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-3012-58/+35
| | | | | | | |
* | | | | | | | Merge branch 'rs-group-convenience-methods' into 'master' Douwe Maan2015-08-071-1/+17
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `Group#add_*` convenience methods Encapsulates the logic for `Gitlab::Access::WHATEVER` levels. See merge request !1111
| * | | | | | | Add `Group#add_*` convenience methodsrs-group-convenience-methodsRobert Speicher2015-08-071-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
* | | | | | | | Merge branch 'explore-markdown' into 'master'Dmitriy Zaporozhets2015-08-071-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply markdown filter for project descriptions on explore view When you open the explore page, then the project descriptions are not rendered correctly (e.g., https://gitlab.com/search?search=tortoisegit). See merge request !1098
| * | | | | | | Apply markdown filter for project descriptions on explore viewSven Strickroth2015-08-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | | | | | Merge branch 'issue-2216' into 'master'Stan Hu2015-08-071-7/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff colors on MR Discussion like on Changes-tab Fixes #2216 # Before ![Screen_Shot_2015-08-06_at_21.44.58](https://gitlab.com/gert/gitlab-ce/uploads/ed5935e0713dd58f9cd4b17a1fecaa86/Screen_Shot_2015-08-06_at_21.44.58.png) # After ![Screen_Shot_2015-08-06_at_21.44.33](https://gitlab.com/gert/gitlab-ce/uploads/0816360afcc7cf860d2eadf8dd63b49e/Screen_Shot_2015-08-06_at_21.44.33.png) See merge request !1108
| * | | | | | | Diff colors on MR Discussion like on Changes-tabGert Goet2015-08-061-7/+8
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Fixes #2216
* | | | | | | 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-061-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-068-0/+125
|\ \ \ \ \ \ \ \
| * | | | | | | | 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-064-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Allow users to send abuse reportsDmitriy Zaporozhets2015-08-064-0/+71
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Add project name to project headDouwe Maan2015-08-063-1/+12
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'remove-email-from-published-keys' into 'master'Douwe Maan2015-08-062-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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