415 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	7534d0ef46	Fix tests ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-29 19:52:25 +03:00
Dmitriy Zaporozhets	b0ed2ff1a6	Merge branch 'atom-feeds-everywhere' into 'master' ... Add project activity atom feed and show atom feed buttons everywhere where applicable. See merge request !555	2015-04-24 10:15:13 +00:00
Robert Speicher	9b330859bf	Change "Sam" to "Dmitriy" in feature steps ... "Sam" was too short and generic and caused invalid test failures due to finding other people with names like "Sammie" or "Samuel" unexpectedly.	2015-04-23 18:59:57 -04:00
Douwe Maan	a8812dc148	Fix spec.	2015-04-23 17:11:39 +02:00
Dmitriy Zaporozhets	e3d818a4e8	Merge branch 'invitation' into 'master' ... Allow users to be invited. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2058. The "Add members" panes for both Group Members and Project Members have gained a line of text by the People field.  Entering an email address that is not already a member will give you the option to invite them.  Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members.  The invited member will be shown in the members list as such. The access level can be changed, and the invite can be revoked by deleting the member.  The invited user will receive an email with an "Accept invitation" link.  If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice.  Signing in or signing up will redirect them back to the invite detail page, where they can actually accept the invitation, which will update the member record in question to point to the user in question.  Accepting the invitation will redirect them to the group (or project) with an appropriate notice.  As currently, they will also receive this information by email.  At the same time, the person who initially invited the email address is sent a notification as well, so they know of the new member and to tell them what name the user signed up with.  The member row on the Members page will now have been updated with the new user account.  See merge request !500	2015-04-15 10:48:28 +00:00
Stan Hu	48efd65ff6	Remove timing dependency on test ... See: http://www.elabs.se/blog/53-why-wait_until-was-removed-from-capybara	2015-04-14 10:34:48 -07:00
Douwe Maan	8949af0c9f	Add feature tests for inviting members.	2015-04-14 12:08:11 +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
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
Stan Hu	3143edfea6	Fix bug where Wiki pages that include a '/' were no longer accessible ... Closes #1363	2015-04-07 09:10:11 -07:00
Douwe Maan	9b3624071e	Add project deploy keys tests.	2015-04-03 12:40:14 +02:00
Douwe Maan	317206300d	Merge branch 'configurable-attachment-size' into 'master' ... Support configurable attachment size in Application Settings page ### What does this MR do? This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page. ### Are there points in the code the reviewer needs to double check? What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid. ### Why was this MR needed? We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? See Issue #1258 ### Screenshots Before:  After:  See merge request !407	2015-04-03 08:47:55 +00:00
Dmitriy Zaporozhets	f8f9750323	Merge branch 'username-period' into 'master' ... Don't allow username to end in period. The current behavior doesn't do username referencing and mentioning in sentences like "I discussed with with @douwe." since `douwe.` is matched as a username. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2174. See merge request !438	2015-04-02 20:28:23 +00:00
Stan Hu	dfd256f29e	Support configurable attachment size via Application Settings ... Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258	2015-04-02 00:04:08 -07:00
Dmitriy Zaporozhets	9d6ffcfa5f	Refactor star btn logic for non-logged in user and fix tests	2015-03-29 18:50:45 -07:00
Douwe Maan	1d829ca151	Fix tests.	2015-03-27 11:10:56 +01:00
Dmitriy Zaporozhets	c1c93f4f7a	Fix tests and unassigned filter for issues. Updated CHANGELOG	2015-03-27 00:27:51 -07:00
Stan Hu	546dab6da9	Fix broken side-by-side diff view on merge request page ... Closes #1294	2015-03-25 23:39:34 -07:00
Stan Hu	eecd897170	Fix code unfold not working on Compare commits page ... Closes #1274	2015-03-24 00:19:41 -07:00
Dmitriy Zaporozhets	1cf138170c	Add tooltip for comment toggle in diff. Add changelog item and fix tests	2015-03-18 20:12:19 -07:00
Dmitriy Zaporozhets	9162e34bb0	Merge branch 'issue_subscription' into 'master' ... Subscription to issue/mr Fixes #1911 and #1909   See merge request !1702	2015-03-17 16:45:04 +00:00
Valery Sizov	22fcb2f418	improve UI	2015-03-17 17:11:57 +02:00
Valery Sizov	1b437ec349	tests	2015-03-16 21:38:41 +02:00
Douwe Maan	f66b77e631	Fix failing specs.	2015-03-15 13:55:57 +01:00
Douwe Maan	5ad35bbe02	Use same layout and interactivity for project members as group members.	2015-03-15 13:55:57 +01:00
Dmitriy Zaporozhets	80b2f3fb86	Implement merge requests search ... It is same search like we have at issues page. It allows to quickly filter merge requests based on title or desription. I copy-pasted some js code from Issues.js. In future search (filtering) logic should be refactoed into one class for merge requests and issues	2015-03-12 16:20:58 -07:00
Sabba PetriandMarin Jankovski	b5ec0d6d45	Spelling change Commit Statistics	2015-03-03 20:38:42 -08:00
Aorimn	f84b7eef3f	Add Irker service ... Irker is a gateway which sends IRC messages on git updates. This new service provides an interface to this gateway, integrated in Gitlab, for each updates. As per the guidelines, this commit adds the new feature in the CHANGELOG, tests and documentation. See http://www.catb.org/esr/irker/	2015-03-01 20:51:03 +01:00
Dmitriy Zaporozhets	cd6baa1415	Merge branch 'line-is-wrong-test' into 'master' ... Make test element selection more specific to fix constantly failing test. Fixes #2051. The problem was that there were two `.note-text` elements matching `.files [id^=diff]:nth-child(2) .note-text`, one for the new comment, and one for the (currently hidden) new comment form. The latter one was selected but currently invisible, triggering the following error in poltergeist: > The element you are trying to interact with is either not part of the DOM, or is not currently visible on the page (perhaps display: none is set). It's possible the element has been replaced by another element and you meant to interact with the new element. If so you need to do a new 'find' in order to get a reference to the new element. This caused the test to fail. See merge request !1592	2015-02-26 02:57:22 +00:00
Douwe Maan	5f7a3e1bbd	Merge branch 'master' into extend_markdown_upload ... # Conflicts: # app/controllers/files_controller.rb	2015-02-25 11:59:25 +01:00
Douwe Maan	9b8d5c4ab4	Make test element selection more specific.	2015-02-25 11:01:50 +01:00
Douwe Maan	0283fff591	Merge branch 'master' into extend_markdown_upload ... # Conflicts: # app/views/projects/issues/_form.html.haml # app/views/projects/merge_requests/_form.html.haml # app/views/projects/merge_requests/_new_submit.html.haml # app/views/projects/milestones/_form.html.haml # app/views/projects/notes/_form.html.haml # app/views/projects/wikis/_form.html.haml # config/routes.rb # spec/controllers/projects_controller_spec.rb	2015-02-24 14:54:39 +01:00
Valery Sizov	3177693c6f	WebEditor: save to new branch: spinach	2015-02-24 11:43:20 +02:00
Douwe Maan	4ef6ffaad3	Split up AttachmentUploader.	2015-02-20 15:19:50 +01:00
Vinnie Okada	9e9ce95d62	Merge branch 'master' into rails-4.1.9 ... Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml	2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets	6a6a334522	Fix active tab tests	2015-02-19 17:24:34 -08:00
Dmitriy Zaporozhets	8184a65644	Revert "Fix broken access control and refactor avatar upload" ... This reverts commit 7d5f86f6cb.	2015-02-19 08:57:35 -08:00
Dmitriy Zaporozhets	0da0d800f2	Merge branch 'md-preview-class' into 'master' ... Make sure Markdown previews always use the same styling as the eventual destination. Font size, image width and code-block styling weren't accurate between the markdown preview and the issue/wiki/note body. See merge request !1514	2015-02-17 20:38:53 +00:00
Douwe Maan	080449f8af	Make sure Markdown previews always use the same styling as the eventual destination.	2015-02-17 17:58:08 +01:00
Hannes RosenöggerandDouwe Maan	7d5f86f6cb	Fix broken access control and refactor avatar upload ... This commit moves the note folder from /public/uploads/note to /uploads/note and changes the uploader accordingly. Now it's no longer possible to avoid the access control by modifing the url. The Avatar upload has been refactored to use an own uploader as well to cleanly seperate the two upload types.	2015-02-16 20:10:15 +01:00
Vinnie Okada	76aad9b76e	Upgrade to Rails 4.1.9 ... Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.	2015-02-14 11:09:23 -07:00
Jeroen van Baarsen	6860004466	Fixed deprecation in spinach stubs ... Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>	2015-02-12 21:22:23 +01:00
Dmitriy Zaporozhets	0a34f2dcb5	Merge pull request #8580 from j0k3r/asana ... Add Asana service	2015-02-08 01:12:41 -08:00
Dmitriy Zaporozhets	ce0811ae5c	Improve tests	2015-02-06 09:19:51 -08:00
Jeremy	3cd1eda5a4	Add restrict_to_branch to service controller ... And add restrict_to_branch to spec	2015-02-02 09:59:42 +01:00
Jeremy	b4d9ceb26f	Add Asana service ... Also add ability to render "service.help" in markdown	2015-02-02 09:59:42 +01:00
Dmitriy Zaporozhets	b076d8cddb	Fix test for merge request	2015-01-28 15:36:12 -08:00
Dmitriy Zaporozhets	f57bffc82a	Merge branch 'init-from-ui' into 'master' ... Add tests for creating bare repo and first file in UI Part of #1930 See merge request !1444	2015-01-27 21:27:59 +00:00
Dmitriy Zaporozhets	fc17b440f9	Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master' ... Move external issue tracker away from yml config See merge request !1442	2015-01-27 20:57:48 +00:00
Dmitriy Zaporozhets	e956066d4a	Add tests for initializing bare repo and creating new file in it	2015-01-27 12:19:32 -08:00