9407 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	680b087764	Merge master from CE ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-17 14:01:32 +02:00
Dmitriy Zaporozhets	39da3fa54b	Fix call of non-existing method ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-10 17:13:20 +02:00
Dmitriy Zaporozhets	0fd7d3ebe0	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-10 16:01:53 +02:00
Dmitriy Zaporozhets	151d9fb35f	Merge branch 'mr-widget-text' into 'master' ... Improve text of MR merge widget and manual merge modal Modal with manual merge instructions:  Archived:  WIP:  Missing target branch:  Missing source branch:  Nothing to merge:  Checking ability to merge:  Conflicts when allowed to merge:  Conflicts when not allowed to merge:  Mergeable when allowed to merge:  Mergeable when not allowed to merge:  Merge in progress:  Merge failed:  Merged:  Closed:  cc @dzaporozhets @rspeicher See merge request !1120	2015-08-10 12:13:26 +00:00
Dmitriy Zaporozhets	819d110cab	Merge branch 'trigger-hooks' into 'master' ... Trigger post-receive hooks after commits are made by GitLab Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1127	2015-08-10 11:57:53 +00:00
Dmitriy Zaporozhets	3752172dcd	Merge branch 'fix-event-cache' into 'master' ... Fix event cache Fixes #2236. See merge request !1128	2015-08-10 11:17:05 +00:00
Dmitriy Zaporozhets	59e7b7a654	Refactor Trigger post-receive hooks after commits are made by GitLab ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-10 13:15:36 +02:00
Douwe Maan	0d1c260122	Fix event cache	2015-08-10 12:31:34 +02:00
Dmitriy Zaporozhets	99585a738c	Trigger post-receive hoooks when commits are made by GitLab ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-10 10:54:42 +02:00
Stan Hu	77f37fa909	Merge branch 'dropzone-upload-progress' into 'master' ... Add dropzone upload progress This MR adds upload progress in percents to dropzone.  I thought, it can be nice small enhancement :) See merge request !1125	2015-08-10 08:05:37 +00:00
Dmitriy Zaporozhets	c3a24cb81f	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee	2015-08-10 09:57:49 +02:00
Nikita Verkhovin	17bab5022f	Add dropzone upload progress	2015-08-10 13:18:02 +06:00
Stan Hu	1a3283d4e8	Merge branch 'gravatar-host-link' into 'master' ... 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	2015-08-09 22:42:07 +00:00
Douwe Maan	78fba275c9	More textual tweaks	2015-08-09 17:46:25 +02:00
Douwe Maan	7b7802377e	Merge branch 'master' into mr-widget-text	2015-08-09 17:40:59 +02:00
Douwe Maan	e6bf9aa719	Make modal narrower	2015-08-09 17:34:28 +02:00
Dmitriy Zaporozhets	b833f208f3	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-08-09 10:31:38 +02:00
Dmitriy Zaporozhets	1309aeb871	Merge branch 'ui-improvements' into 'master' ... 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	2015-08-09 08:30:48 +00:00
Stan Hu	efb17e0599	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-08-09 00:51:20 -07:00
Robert Speicher	8ceb7c0515	Merge branch 'rs-fix-msapplication-tileimage' into 'master' ... Fix transparency for msapplication-tile image See merge request !1122	2015-08-09 02:04:57 +00:00
Robert Speicher	48cf97e8d3	Merge branch 'cache-events' into 'master' ... 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	2015-08-09 02:03:46 +00:00
Robert Speicher	3f045b25d7	Fix transparency for msapplication-tile image ... [ci skip]	2015-08-08 22:03:00 -04:00
Robert Speicher	1f9487f7f4	Merge branch 'ldap-sync-group-members' into 'master' ... Disable adding, updating and removing members from a group that is synced with LDAP. Addresses #290. See merge request !465	2015-08-09 01:44:28 +00:00
Douwe Maan	211fe02848	Tweak MR widget text some more.	2015-08-08 21:51:50 +02:00
Douwe Maan	b2334da40e	Improve text in MR "How To Merge" modal.	2015-08-08 21:51:42 +02:00
Douwe Maan	b8590da024	Improve MR merge widget text and UI consistency.	2015-08-08 21:24:43 +02:00
Stefan Tatschner	6783437ce5	Improve abuse report wording	2015-08-08 19:46:34 +02:00
Robert Speicher	a71bed53e0	Merge branch 'merge-notifs' into 'master' ... See merge request !1077	2015-08-07 18:47:02 -04:00
Dmitriy Zaporozhets	1c3c232608	Revert "Put author name at the end of a tree row" ... This reverts commit ee0fc2c3ad.	2015-08-07 18:12:15 +02:00
Dmitriy Zaporozhets	71158b11f2	Add more spacing between MR widget and tabs ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-07 18:00:55 +02:00
Douwe Maan	0c31701932	Merge branch 'bitbucket-show-incompatible' into 'master' ... 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  ### What are the relevant issue numbers? #1871 See merge request !1114	2015-08-07 14:46:05 +00:00
Dmitriy Zaporozhets	4773f38e28	Merge branch 'improve-merge-requests' into 'master' ... 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	2015-08-07 14:44:54 +00:00
Douwe Maan	0d5d80b735	Merge branch 'comment-updated-by' into 'master' ... 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	2015-08-07 14:44:28 +00:00
Stan Hu	d7accda1ae	Show incompatible projects in Bitbucket import status ... See #1871	2015-08-07 07:07:08 -07:00
Dmitriy Zaporozhets	fd2f907b01	Move command line insturction out of mr widget ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-07 16:04:17 +02:00
Douwe Maan	9b6c513bf7	Merge branch 'rs-group-convenience-methods' into 'master' ... Add `Group#add_*` convenience methods Encapsulates the logic for `Gitlab::Access::WHATEVER` levels. See merge request !1111	2015-08-07 13:31:25 +00:00
Dmitriy Zaporozhets	3cf4a981d6	Refactor merge request widget ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-07 15:17:10 +02:00
Douwe Maan	ad55f0d6f9	Merge branch 'master' into comment-updated-by	2015-08-07 15:05:17 +02:00
Dmitriy Zaporozhets	fe4b065202	Link mr commits/diffs to target project ... 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>	2015-08-07 13:05:52 +02:00
Dmitriy Zaporozhets	86bccb71a1	Create ref for every merge request. Add documentation for fetch merge requests ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-07 12:54:58 +02:00
Dmitriy Zaporozhets	8dce66234f	Fetch to mr code from fork to iid ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-07 12:35:04 +02:00
Dmitriy Zaporozhets	a2d6af9772	Merge branch 'explore-markdown' into 'master' ... 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	2015-08-07 07:56:13 +00:00
Stan Hu	a1e6fc157f	Merge branch 'issue-2216' into 'master' ... Diff colors on MR Discussion like on Changes-tab Fixes #2216 # Before  # After  See merge request !1108	2015-08-07 04:28:10 +00:00
Robert Speicher	fb6dc1f07d	Add Group#add_* convenience methods ... Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.	2015-08-07 00:20:02 -04:00
Dmitriy Zaporozhets	5fb5fd253a	Merge branch 'nicer-merge-conflicts-widget' into 'master' ... Split merge conflict messages on 2 lines Before  After  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1107	2015-08-06 20:35:36 +00:00
Gert Goet	7d2259b36f	Diff colors on MR Discussion like on Changes-tab ... Fixes #2216	2015-08-06 21:39:22 +02:00
Dmitriy Zaporozhets	c5eb2977d7	Merge branch 'add-current-user-to-autocomplete' into 'master' ... 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	2015-08-06 16:10:38 +00:00
Dmitriy Zaporozhets	2c46cf084b	Merge branch 'fix-namespace-move-dir' into 'master' ... Ensure old namespace directory exists before moving it Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #983 See merge request !1101	2015-08-06 16:09:11 +00:00
Dmitriy Zaporozhets	dcb0bf0df5	Merge branch 'report-spam'	2015-08-06 18:07:36 +02:00
Dmitriy Zaporozhets	ab6aa8a48b	Split merge conflict messages on 2 lines ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-06 17:22:45 +02:00