4837 Commits

Include renames

Author	SHA1	Message	Date
Douwe Maan	6157dad9ff	Merge branch 'master' into 'master' ... Fix error message This merge request fixes issue when somebody try to import repository (to which that user can't add deploy keys) and has no feedback. See merge request !518	2015-04-14 15:08:58 +00:00
Dmitriy Zaporozhets	dab1824679	Align project download button with others in sidebar on project home page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-14 17:08:01 +03:00
Dmitriy Zaporozhets	29970204ea	Fix button overflow for branches/tags pages ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-14 16:26:47 +03:00
Jason Blanchard	f543f1c3dd	Remove truncation from issue titles on milestone page	2015-04-14 09:17:57 -04:00
Douwe Maan	1abda4458e	"interpunction" -> "punctuation"	2015-04-14 14:59:10 +02:00
Douwe Maan	4c6ce0ef78	Move Specify user map button to paragraph.	2015-04-14 14:57:15 +02:00
Douwe Maan	dba63d667d	Allow user map to be specified.	2015-04-14 14:50:56 +02:00
Senorsen	7b28218f96	Allow user to choose which email to be public ... This commit allows user to show one of their emails in profile page, or don't show email in this page.	2015-04-14 19:42:48 +08:00
Douwe Maan	e50556fcc8	Let invites be declined.	2015-04-14 12:08:11 +02:00
Douwe Maan	405df43558	Use "Sign out" instead of "Logout" for consistency.	2015-04-14 12:08:11 +02:00
Douwe Maan	453340d449	Let membership invitations be resent.	2015-04-14 12:08:10 +02:00
Douwe Maan	87dd3f215f	Let members be invited from Add members pane.	2015-04-14 12:08:10 +02:00
Douwe Maan	39f389ae0f	Add invites controller.	2015-04-14 12:07:33 +02:00
Douwe Maan	2a1d4255da	Correctly render invite members without user.	2015-04-14 12:07:33 +02:00
Douwe Maan	cee98f2247	Reference project members by id instead of user_id.	2015-04-14 12:06:43 +02:00
Douwe Maan	ff3caad4ca	Rename manage_group ability to admin_group for consistency with project.	2015-04-14 12:05:49 +02:00
Douwe Maan	36537c65e3	Merge branch 'revert_fix_email_images' into 'master' ... Revert "Merge branch 'fix_email_images' into 'master'" This reverts commit d66148ef39, reversing changes made to cdb64a81a8. This change needed to be reverted, because not enough email clients support inline images. /cc @DouweM As discussed before. I'll try to create a MR to allow access to all images this week. I'm a bit busy at the moment so no guarantees. ;) See merge request !513	2015-04-14 08:44:24 +00:00
Zbigniew Motyka	bf2db3ec03	Fix error message	2015-04-14 10:20:07 +02:00
Hannes Rosenögger	63f0f6f315	Merge branch 'empty-avatar-alt-text' into 'master' ... Explicitly set image alt to prevent graphical glitches Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded. Fixes https://github.com/gitlabhq/gitlabhq/issues/6036. Signed-off-by: Sven Strickroth <email@cs-ware.de> See merge request !503	2015-04-13 19:13:09 +00:00
Sven Strickroth	57c2a9f03d	Explicitly set image alt to prevent graphical glitches ... Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded. Fixes https://github.com/gitlabhq/gitlabhq/issues/6036. Signed-off-by: Sven Strickroth <email@cs-ware.de>	2015-04-13 21:07:42 +02:00
Hannes Rosenögger	de825b54d4	Merge branch 'remove-sidebar-help-link' into 'master' ... Removed help link from sidebar Closes #1349 I don't see the point in having two links on the page that will do the same thing. See merge request !483	2015-04-13 19:04:22 +00:00
Dmitriy Zaporozhets	ecb58dacd6	Merge branch 'reference-access-control' into 'master' ... Only allow users to reference groups, projects, issues, MRs, commits they have access to. Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183. See merge request !1742	2015-04-13 14:10:25 +00:00
Dmitriy Zaporozhets	c543cd1ed3	Fix performance issue when browse big diffs ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-13 15:51:28 +03:00
Hannes Rosenögger	8e9fbd847d	Revert "Merge branch 'fix_email_images' into 'master'" ... This reverts commit d66148ef39, reversing changes made to cdb64a81a8. This change needed to be reverted, because not enough email clients support inline images.	2015-04-13 12:34:47 +02:00
Dmitriy Zaporozhets	9c14ed0689	Merge branch 'public-deploy-keys' into 'master' ... Allow admin to create public deploy keys that are accessible to any project. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774. Project settings:  The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown. The list of projects below the public key has been changed to only show projects the user has access to. "Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys. Admin index:  Admin detail page:  Projects using the deploy key are listed on the left and can be disabled easily. See merge request !469	2015-04-13 09:08:13 +00:00
Dmitriy Zaporozhets	0c24192fb1	Merge branch 'fix-group-project-list-cache' into 'master' ... Bust group page project list cache when namespace name or path changes. Fixes gitlab-com/support-forum#144. See merge request !509	2015-04-13 09:01:03 +00:00
Stan Hu	8ce69bdc8e	Fix typo	2015-04-11 21:13:14 -07:00
Douwe Maan	562a9b1a87	Bust group page project list cache when namespace name or path changes.	2015-04-10 16:10:25 +02:00
Stan Hu	3d2c387840	Move current user to the top of the list in author/assignee filters ... Closes #1321	2015-04-09 01:04:53 -07:00
Dmitriy Zaporozhets	a381ecbdbc	Merge branch 'project-file-tabs' into 'master' ... Move project file links to tab bar. The sidebar was getting awfully crowded, so I moved the file links to the tab bar alongside Activity and Readme. Unlike Readme, these files are not actually loaded in a tab, but simply link to the relevant blob, because we don't want to unnecessarily load the potentially large changelog or contribution guide on every project page load.  See merge request !497	2015-04-08 13:10:52 +00:00
Dmitriy Zaporozhets	a4ff127728	Merge branch 'rs-application-form-messages' into 'master' ... Make the "New Application" form's error messages visible Prior, if you submit the form without values the error text and the form fields were white-on-white:  After:  See merge request !1752	2015-04-08 11:14:08 +00:00
Dmitriy Zaporozhets	584fa0bdca	Merge branch 'rs-signup-box-text' into 'master' ... Improve wording below signup box Before:  After:  See merge request !1755	2015-04-08 11:10:41 +00:00
Dmitriy Zaporozhets	7b00721bb9	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-08 14:10:08 +03:00
Robert Speicher	8714038410	Improve wording below signup box ... [ci skip]	2015-04-07 17:46:00 -04:00
Robert Speicher	b9069f31b9	Make the New Application form's error messages visible	2015-04-07 13:01:30 -04:00
Dmitriy Zaporozhets	7d57d8b783	Merge branch 'rs-issue-2088' into 'master' ... Lower the pointHitDetectionRadius for commit charts Needed to update the Chart.js dependency as well. Fixes #2088 See merge request !1749	2015-04-07 10:07:52 +00:00
Dmitriy Zaporozhets	7feec5fe05	Merge branch 'add-menu-icons' into 'master' ... Add icons to Add dropdown items. Before:  After:  See merge request !498	2015-04-07 09:55:48 +00:00
Dmitriy Zaporozhets	18dfe0ce76	Merge branch 'emailsonpush-last-line' into 'master' ... Fix final line in EmailsOnPush email diff being rendered as error. Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194. Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18. See merge request !480	2015-04-07 09:54:23 +00:00
Dmitriy Zaporozhets	d21d5d2d72	Merge branch 'import-event' into 'master' ... Add event to activity feed for imported projects.  See merge request !496	2015-04-07 09:46:11 +00:00
Robert Speicher	5cc11cfcab	Lower the pointHitDetectionRadius for commit charts ... Fixes #2088	2015-04-07 00:37:05 -04:00
Douwe Maan	cf0e84cf04	Add icons to Add dropdown items.	2015-04-06 15:13:50 +02:00
Douwe Maan	ee9e922e96	Move project file links to tab bar.	2015-04-06 15:04:13 +02:00
Douwe Maan	4740242a67	Change text of project creation event for imports.	2015-04-06 14:51:41 +02:00
Ben Bodenmiller	af4577d779	remove extra scrollbar on background jobs	2015-04-04 05:46:18 -07:00
Douwe Maan	45ca39e81b	Merge remote-tracking branch 'github.com/master'	2015-04-04 14:23:32 +02:00
Drew Blessing	aaacef47ff	Merge branch 'fix-admin-project-urls' into 'master' ... Link paths for http and ssh in the admin project show view are incorrect The link paths for http and ssh in the admin project show view are incorrect. Clicking on them effectively reloads the page. I think the intent is to have the links point to the project dashboard. Incorrect: http://gitlab.example.com/admin/projects/[namespace]/[project] Correct: http://gitlab.example.com/[namespace]/[project] See merge request !214	2015-04-03 15:09:30 +00:00
Douwe Maan	17e2310878	Add instructions to Google Code import page.	2015-04-03 16:02:39 +02:00
Douwe Maan	7b5bc32cad	Allow projects to be imported from Google Code.	2015-04-03 15:29:27 +02:00
Douwe Maan	ed097df627	Clean up code.	2015-04-03 12:28:47 +02:00
Douwe Maan	edc4a56d26	Allow admin to create public deploy keys that are accessible to any project.	2015-04-03 12:23:20 +02:00