22224 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Douwe Maan	b716e45de1	Fix spec	2015-08-10 14:15:27 +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
Nikita Verkhovin	17bab5022f	Add dropzone upload progress	2015-08-10 13:18:02 +06:00
Robert Speicher	fb6f8d9198	Merge branch 'rs-reference-data-attrs' into 'master' ... Add `data-[type]-id` attribute to reference links This is to let us redact them later in another filter. See merge request !1110	2015-08-10 00:07:56 +00: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
Stan Hu	c5648de230	Fix corrupted binary files when using API files endpoint ... Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219	2015-08-09 15:23:22 -07:00
Douwe Maan	78fba275c9	More textual tweaks	2015-08-09 17:46:25 +02:00
Douwe Maan	22285b1d39	Merge branch 'master' into check-out-branch-button	2015-08-09 17:41:31 +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
Sven Strickroth	1567914f7c	Drop the user name from tree row to improve readability of commit messages ... Signed-off-by: Sven Strickroth <email@cs-ware.de>	2015-08-09 14:40:16 +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
Stan Hu	91083d9ebb	Merge pull request #9543 from rumpelsepp/english ... Improve abuse report wording	2015-08-09 00:45:47 -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	32e63ba7a1	Add data-[type]-id attribute to reference links ... This is to let us redact them later in another filter.	2015-08-08 16:43:29 -04:00
Douwe Maan	5ac504e394	Fix changelog.	2015-08-08 21:58:40 +02: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	9049cdff5a	Add "Check out branch" button to the MR page.	2015-08-08 21:27:29 +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
karen Carias	082467e8e6	Info about not receiving emails	2015-08-07 13:07:04 -07:00
Achilleas Pipinellis	8ab6bd3eb3	Do a git checkout on Gemfile.lock and schema.rb prior to update. Fixes #2227	2015-08-07 22:13:18 +03:00
Stan Hu	59c486dcc1	Merge branch 'fix-changelog-versions' into 'master' ... Fix CHANGELOG entries to belong in the right version Reorder entries that were improperly grouped (one fix mentioned in #1522). See merge request !1118	2015-08-07 17:28:41 +00:00
Stan Hu	1681fd7b6e	Fix entries to belong in the right version	2015-08-07 10:25:31 -07: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	3c5ef17975	Link merge request doc to README ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-07 13:07:03 +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