delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Trigger post-receive hoooks when commits are made by GitLabtrigger-hooks	Dmitriy Zaporozhets	2015-08-10	2	-2/+65
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'rs-reference-data-attrs' into 'master'	Robert Speicher	2015-08-10	15	-8/+96
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add `data-[type]-id` attribute to reference links This is to let us redact them later in another filter. See merge request !1110
\| *	Add `data-[type]-id` attribute to reference linksrs-reference-data-attrs	Robert Speicher	2015-08-08	15	-8/+96
\| \| \| \| \| \| \| \|	This is to let us redact them later in another filter.
* \|	Merge branch 'gravatar-host-link' into 'master'	Stan Hu	2015-08-09	5	-2/+19
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 page	Ben Bodenmiller	2015-08-05	5	-2/+19
\| \| \|
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-08-09	3	-7/+11
\|\ \ \
\| * \ \	Merge branch 'ui-improvements' into 'master'	Dmitriy Zaporozhets	2015-08-09	3	-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 Zaporozhets	2015-08-07	2	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit ee0fc2c3ad9608db91175e082fe1f6da19a3aec7.
\| \| * \| \|	Add more spacing between MR widget and tabs	Dmitriy Zaporozhets	2015-08-07	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Stan Hu	2015-08-09	11	-66/+85
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'rs-fix-msapplication-tileimage' into 'master'	Robert Speicher	2015-08-09	1	-0/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix transparency for msapplication-tile image See merge request !1122
\| \| * \| \| \|	Fix transparency for msapplication-tile image	Robert Speicher	2015-08-08	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Merge branch 'cache-events' into 'master'	Robert Speicher	2015-08-09	6	-14/+40
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-events	Douwe Maan	2015-08-06	2	-1/+9
\| \| \| \| \| \|
\| \| * \| \| \|	Cache all events	Douwe Maan	2015-08-06	6	-14/+32
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'merge-notifs' into 'master'	Robert Speicher	2015-08-07	4	-52/+44
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !1077
\| \| * \ \ \ \	Merge branch 'master' into merge-notifsmerge-notifs	Douwe Maan	2015-08-06	159	-1591/+1715
\| \| \|\ \ \ \ \ \| \| \| \|/ / / /
\| \| * \| \| \| \|	Update notification docs	Douwe Maan	2015-08-06	1	-11/+28
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Send notification to all participants when MR is merged.	Douwe Maan	2015-07-30	3	-41/+16
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Do a git checkout on Gemfile.lock and schema.rb prior to update. Fixes #2227	Achilleas Pipinellis	2015-08-07	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #9543 from rumpelsepp/english	Stan Hu	2015-08-09	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Improve abuse report wording
\| * \| \| \| \| \|	Improve abuse report wording	Stefan Tatschner	2015-08-08	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'fix-changelog-versions' into 'master'	Stan Hu	2015-08-07	1	-5/+3
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CHANGELOG entries to belong in the right version Reorder entries that were improperly grouped (one fix mentioned in #1522). See merge request !1118
\| * \| \| \| \|	Fix entries to belong in the right version	Stan Hu	2015-08-07	1	-5/+3
\|/ / / / /
* \| \| \| \|	Merge branch 'bitbucket-show-incompatible' into 'master'	Douwe Maan	2015-08-07	5	-6/+37
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 status	Stan Hu	2015-08-07	5	-6/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See #1871
* \| \| \| \| \|	Merge branch 'improve-merge-requests' into 'master'	Dmitriy Zaporozhets	2015-08-07	13	-160/+154
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 widget	Dmitriy Zaporozhets	2015-08-07	4	-46/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Refactor merge request widget	Dmitriy Zaporozhets	2015-08-07	7	-117/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Link merge request doc to READMEimprove-merge-requests	Dmitriy Zaporozhets	2015-08-07	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Link mr commits/diffs to target project	Dmitriy Zaporozhets	2015-08-07	2	-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 requests	Dmitriy Zaporozhets	2015-08-07	2	-2/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Fetch to mr code from fork to iid	Dmitriy Zaporozhets	2015-08-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'comment-updated-by' into 'master'	Douwe Maan	2015-08-07	16	-66/+52
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-by	Douwe Maan	2015-08-07	31	-17/+293
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge branch 'master' into comment-updated-by	Douwe Maan	2015-08-06	149	-1254/+1247
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into comment-updated-by	Douwe Maan	2015-07-31	26	-362/+512
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Reset correct event cache	Douwe Maan	2015-07-31	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Show who last edited a comment if it wasn't the original author	Douwe Maan	2015-07-30	16	-67/+53
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rs-group-convenience-methods' into 'master'	Douwe Maan	2015-08-07	11	-14/+30
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `Group#add_*` convenience methods Encapsulates the logic for `Gitlab::Access::WHATEVER` levels. See merge request !1111
\| * \| \| \| \| \| \| \|	Add `Group#add_*` convenience methodsrs-group-convenience-methods	Robert Speicher	2015-08-07	11	-14/+30
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
* \| \| \| \| \| \| \|	Merge branch 'bump_gitlab_shell' into 'master'	Dmitriy Zaporozhets	2015-08-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab-shell bump to 2.6.4 See merge request !1095
\| * \| \| \| \| \| \| \|	gitlab-shell bump to 2.6.4bump_gitlab_shell	Valery Sizov	2015-08-05	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'explore-markdown' into 'master'	Dmitriy Zaporozhets	2015-08-07	1	-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 view	Sven Strickroth	2015-08-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Sven Strickroth <email@cs-ware.de>
* \| \| \| \| \| \| \| \|	Merge branch 'issue-2216' into 'master'	Stan Hu	2015-08-07	2	-7/+9
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Add fix #2216 in CHANGELOG [ci skip]	Gert Goet	2015-08-06	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Diff colors on MR Discussion like on Changes-tab	Gert Goet	2015-08-06	1	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2216
* \| \| \| \| \| \| \| \|	Merge branch 'nicer-merge-conflicts-widget' into 'master'	Dmitriy Zaporozhets	2015-08-06	1	-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-widget	Dmitriy Zaporozhets	2015-08-06	1	-1/+2
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>