4837 Commits

Include renames

Author	SHA1	Message	Date
Douwe Maan	0b5acdd88f	Show buttons to add license, changelog and contribution guide if they're missing.	2015-07-30 15:12:57 +02:00
Douwe Maan	36bd6c8494	Show who last edited a comment if it wasn't the original author	2015-07-30 14:45:54 +02:00
Douwe Maan	1e4b326463	Merge branch 'fix-single-quote-in-network-graph' into 'master' ... Fix network graph when branch name has single quotes ## Steps to reproduce 1. Create a branch with a single quote in the branch name: "`test`" 2. Look at Project's Network view Closes https://github.com/gitlabhq/gitlabhq/issues/9500 See merge request !1063	2015-07-30 09:39:28 +00:00
Job van der Voort	ae36842d45	Merge branch 'ssh-key-form' into 'master' ... Switched the order of the SSH key form Now it looks like this:  See merge request !1069	2015-07-30 09:26:56 +00:00
Stan Hu	369275d630	Fix network graph when branch name has single quotes ... Closes https://github.com/gitlabhq/gitlabhq/issues/9500	2015-07-29 23:29:47 -07:00
Darby	34c2867ca2	Switched the otder of the SSH key form	2015-07-29 12:59:50 -07:00
Douwe Maan	d953f6927c	Restore Leave button on dashboard groups page	2015-07-29 12:15:21 +02:00
Daryl Chan	e72a9685f3	Added tags to disable autocapitalize and autocorrect on login field ... - Updated CHANGELOG	2015-07-29 15:42:52 +08:00
Douwe Maan	b230335090	Show Leave button when you're the last owner, so that the error explains the reason	2015-07-28 17:52:38 +02:00
Douwe Maan	45acfdd32a	Disable adding members from admin area when appropriate	2015-07-28 16:36:48 +02:00
Douwe Maan	f9bcb9632c	Add specific ability for managing group members	2015-07-28 16:32:15 +02:00
Job van der Voort	f21ac8f5c6	Merge branch 'timestamp-wikis' into 'master' ... Added a timestamp to the wikis page just below the title Now it looks like this:  See merge request !1055	2015-07-28 13:47:25 +00:00
Douwe Maan	4fae34d629	Merge branch 'fix-quotes-in-branch' into 'master' ... Fix commit data retrieval when branch name has single quotes Quotes in ref names need to be escaped properly in JavaScript. Closes #1724 See merge request !1046	2015-07-28 09:13:52 +00:00
Darby	30b2a95b4d	Added a timestamp to the wikis page just below the title	2015-07-27 17:41:31 -04:00
Robert Speicher	7679a7ea55	Render Note field hints consistently for "new" and "edit" forms ... - The "Edit" form didn't have Markdown hints. - The "New" form had a paperclip icon for attachments, the "edit" form didn't. Closes #2010 Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525	2015-07-26 16:55:43 -04:00
Stan Hu	562242cb9d	Fix commit data retrieval when branch name has single quotes ... Closes #1724	2015-07-26 03:47:01 -07:00
Stan Hu	4a76cbe219	Merge branch 'fix-reload-with-full-diff-url' into 'master' ... Fix the "Reload with full diff" URL button On the first load, the merge request tabs would be requested in JSON format to render the HTML. This would cause the "Reload with full diff" button to create a link to `diff.json`. Instead, generate the path in HTML mode. Closes #2041 See merge request !1019	2015-07-25 15:38:23 +00:00
Douwe Maan	fffbc36931	Merge branch 'rs-issue-2092' into 'master' ... Dynamically check `:admin_*` ability in two more spots. Closes #2092 Depends on !1037 See merge request !1042	2015-07-25 12:08:36 +00:00
Stan Hu	71a8c780ff	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-07-24 14:39:04 -07:00
Robert Speicher	e496c35fed	Dynamically check :admin_* ability on issuable form ... Closes #2092	2015-07-24 15:50:12 -04:00
Robert Speicher	37bc7bac19	Add Issuable#to_ability_name	2015-07-24 15:50:12 -04:00
Valery Sizov	70de5114fb	Merge branch 'auth-icons-labels' into 'master' ... Allow custom label to be set for authentication providers. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2341 Beside the above, I've: - Refactored `OauthHelper` to have clearer method names and behaviour - Moved some of `OauthHelper` behaviour to `Gitlab::OAuth::Provider` - Renamed `OauthHelper` to `AuthHelper` since LDAP, SAML, Kerberos aren't OAuth - Updated the icons for GitHub and GitLab In the examples below, "OurAuth" is a SAML provider with a custom label.     See merge request !927	2015-07-24 11:28:55 +00:00
Robert Speicher	cad0e848b0	Fix and style the "Changes suppressed" link.	2015-07-23 16:07:45 -04:00
Stan Hu	ae3f869fd1	Fix the "Reload with full diff" URL button ... On the first load, the merge request tabs would be requested in JSON format to render the HTML. This would cause the "Reload with full diff" button to create a link to diff.json. Closes #2041	2015-07-23 12:53:54 -07:00
Douwe Maan	b7be08c515	Merge branch 'changes_for_gmail_inbox_actions' into 'master' ... Changes for gmail inbox actions Related to the ongoing efforts to get Gmail inbox actions for GitLab.com in #1517 Not using `mdash` would break the rendering of the html email by switching `Content-Transfer-Encoding` to `quoted-printable` for every email. Removed the rake task and docs to prevent users from sending dummy emails which might cause application rejection. See merge request !1024	2015-07-23 14:35:31 +00:00
Douwe Maan	70a3c165a9	Allow custom label to be set for authentication providers.	2015-07-23 15:20:12 +02:00
Valery Sizov	4466f25dd5	revert cache for events	2015-07-23 10:47:39 +03:00
Valery Sizov	db69c7325c	Merge branch 'label_caching' into 'master' ... Revert cache issue It reverts https://dev.gitlab.org/gitlab/gitlabhq/commit/40e31e1db31e6ba9a1cd6255afc2f09df61f4060 and fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2048 and https://gitlab.com/gitlab-org/gitlab-ce/issues/2043 See merge request !1028	2015-07-23 07:45:37 +00:00
Valery Sizov	6454bcbfa4	revert cache issue	2015-07-22 17:53:18 +03:00
Achilleas Pipinellis	bde2173b63	Fix link to 2fa help page. Closes #2055	2015-07-22 17:03:38 +03:00
ngentile	dbff6bc106	Gitlab Issue 707: Indent unfolded code 1 character	2015-07-22 09:58:17 -04:00
Marin Jankovski	aee579eac2	Use mdash to prevent breaking html emails.	2015-07-22 11:31:15 +02:00
Hannes Rosenögger	bf3b318ec5	revert caching of note text	2015-07-21 13:59:14 +02:00
Stan Hu	3522018db3	Merge branch 'mr-fetch-command' into 'master' ... merge_requests: add fetch command to the MR page In our instance, users asked for an easy way to get the contents of the MR into their local clone. This adds a command line which can be used to fetch the contents of the MR. Screenshot:  See merge request !678	2015-07-20 16:40:24 +00:00
Ben Boeckel	374b95c38e	merge_requests: add fetch command to the MR page	2015-07-20 11:23:27 -04:00
Valery Sizov	922b738ae5	Merge branch 'remove-redundant-last-push' into 'master' ... Remove redundant last push event if activity feed is set to main page ### What does this MR do? This MR eliminates a redundant last push event message if the user's preferences are set to the main activity feed. ### Why was this MR needed? Lots of wasted space was introduced as a result. ### Screenshots #### Before  #### After  ### What are the relevant issue numbers? Closes #2009 See merge request !995	2015-07-20 12:12:24 +00:00
Robert Speicher	e65b081062	Dynamically check :admin_* ability in issuable context ... Closes #2001	2015-07-19 16:48:33 -04:00
Stan Hu	682c0deffe	Remove redundant last push event if activity feed is set to main page ... Closes #2009	2015-07-18 08:02:38 -07:00
Stan Hu	875d8e7f31	Fix bug where notes were being rendered with wrong color preferences due to caching ... Closes #2008	2015-07-18 07:32:18 -07:00
Stan Hu	a84ed6eb23	Merge branch 'add-support-remove-milestone' into 'master' ... Add support for destroying project milestones ### What does this MR do? This MR adds a "Remove" button to the project milestones page and the milestone page itself. ### Why was this MR needed? Because lots of people talked about needing to clean their toilets. :) ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/1504 ### Screenshots   See merge request !980	2015-07-17 17:15:27 +00:00
Stan Hu	df2bb60f90	Add support for destroying project milestones ... Closes https://github.com/gitlabhq/gitlabhq/issues/1504	2015-07-17 06:54:32 -07:00
Dmitriy Zaporozhets	f0116f1335	Store commit count in project table ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-17 15:22:56 +02:00
Dmitriy Zaporozhets	971e47520f	Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix reload with full diff link ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-16 16:32:43 +02:00
Dmitriy Zaporozhets	a7fded9b95	Huge refactoring for accepting merge requests ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-16 16:03:07 +02:00
Dmitriy Zaporozhets	2a6f522cac	Implement merge from forks without satellites	2015-07-15 16:45:50 +02:00
Valery Sizov	d2479a25c7	Time ago fix for compare page	2015-07-15 16:59:31 +03:00
Dmitriy Zaporozhets	a87989fb7d	Remove satellites	2015-07-15 15:45:57 +02:00
Dmitriy Zaporozhets	98cb6256fa	Add nice scroll for sidebar ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-14 12:29:57 +02:00
Dmitriy Zaporozhets	5c53dc5a1e	Merge branch 'project-default-view' into 'master' ... Allow user to specify content he wants to see on project page Improvement to !938. Since a lot of people complain on fact they don't like to see README. Especially since we already have a switcher for dashboard - it kind of acceptable to select behaviour. User can specify which content he/she wants to see:   cc @JobV @jacobvosmaer @marin @sytses See merge request !970	2015-07-14 08:30:46 +00:00
Dmitriy Zaporozhets	fd84567545	Improve project new item dropdown ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-13 23:36:21 +02:00