1955 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	97cf775753	Merge branch 'ce-to-ee' into 'master' ... CE to EE See merge request !380	2015-04-24 10:29:08 +00:00
Dmitriy Zaporozhets	0d2f3318fb	Merge branch 'add_comment_when_it_is_new' into 'master' ... Check if comment exists before sending a reference to Jira Currently every time an issue is mentioned, Jira service sends a reference to Jira. To prevent problems like described in #265 , add another query to the process to retrieve all comments for the issue so we can see if it contains the reference we want to add. See merge request !377	2015-04-24 09:50:04 +00:00
Dmitriy Zaporozhets	f502b293e5	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb spec/helpers/gitlab_markdown_helper_spec.rb	2015-04-24 11:22:54 +03:00
Dmitriy Zaporozhets	c30079f3f4	Merge branch 'rs-mentionable-examples-refactor' into 'master' ... Update mentionable shared examples to be (a bit) more understandable These shared examples were super confusing, and honestly still kind of are, but they should be a bit better now. I encountered a bunch of headaches in these examples while refactoring ReferenceExtractor, so that's how I ended up changing it. See merge request !1780	2015-04-23 20:50:48 +00:00
Marin Jankovski	ec350f0bcf	Merge pull request #9042 from skburgart/fix/jira-link ... Fix broken link in jira service	2015-04-23 15:14:48 +02:00
Dmitriy Zaporozhets	285ae60c15	Merge branch 'issue-body-code-mentions' into 'master' ... Fix bug causing at-username inside code blocks to sometimes be picked up as a user mention. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2254. See merge request !553	2015-04-23 12:33:01 +00:00
Chulki Lee	681fb7def6	do not send empty message to hipchat	2015-04-22 08:05:19 +09:00
Marin Jankovski	f72a81089f	Test existing comment query. Add logging when testing jira service settings.	2015-04-21 20:02:59 +02:00
Douwe Maan	51ad59e0d8	Fix bug causing @whatever inside code blocks to sometimes be picked up as a user mention.	2015-04-21 14:58:18 +02:00
Robert Speicher	c1c1ef52c3	Remove duplicate ampersand from Label title format validator	2015-04-20 13:01:43 -04:00
Dmitriy Zaporozhets	5b10796235	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/models/project.rb db/schema.rb	2015-04-20 19:19:27 +03:00
Marin Jankovski	5bfec246f0	Check if the reference has been already created before adding comment to jira.	2015-04-20 17:24:16 +02:00
Dmitriy Zaporozhets	a4006a6b48	Merge branch 'better-commit-mentions' into 'master' ... Clean up code around commit mentions. Builds upon !527. See merge request !528	2015-04-20 12:42:31 +00:00
Douwe Maan	da89ebbe48	Fix label color input.	2015-04-17 17:38:31 +02:00
Dmitriy Zaporozhets	e1099f9717	Merge branch 'google-code-import-performance' into 'master' ... Decrease memory use and increase performance of Google Code importer. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2241. See merge request !536	2015-04-17 14:01:33 +00:00
Douwe Maan	7d98c8842d	Move import data out of project so it doesn't take ages to load.	2015-04-17 14:49:00 +02:00
Douwe Maan	46524ecb33	Fix username period migration to preserve uniqueness of names and paths.	2015-04-17 12:03:54 +02:00
Douwe Maan	630e879066	Clean up code somewhat.	2015-04-17 11:03:33 +02:00
Robert Speicher	2dace3679f	Note#cross_reference_exists? should be checking the noteable_type also	2015-04-16 16:30:15 -04:00
Dmitriy Zaporozhets	0df63b727a	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee	2015-04-16 11:53:32 +03:00
Douwe Maan	a9b04c4536	Fix Snippet#participants.	2015-04-15 18:59:01 +02:00
Dominik Sander	d4fec49abc	Fix merge request comments on files with multiple commits ... Having a merge request with a comments on a line which is then changed in a later commit prevented new comments from properly showing up in the merge request show page. * `Note#set_diff` do not use stored the diff when creating a new note in merge requests (we can not be sure the diff did not changed since the last comment on that line) * Do not rely just on `outdated?` of the first note when displaying comments of a MR in the discussion tab, but partition the active/outdated notes and display them all * In the inline changes tab just select the active notes, so an outdated note does not prevent an active one from being rendered * Just show active comments in the side-by-side changes tab	2015-04-15 18:23:57 +02:00
Dmitriy Zaporozhets	d01d0c02b7	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/controllers/groups/group_members_controller.rb app/controllers/projects/deploy_keys_controller.rb app/controllers/projects/project_members_controller.rb app/models/concerns/mentionable.rb app/models/project.rb app/models/project_team.rb app/models/service.rb app/views/admin/application_settings/_form.html.haml app/views/admin/groups/show.html.haml app/views/groups/group_members/_new_group_member.html.haml config/initializers/1_settings.rb db/schema.rb lib/gitlab/reference_extractor.rb spec/lib/gitlab/reference_extractor_spec.rb	2015-04-15 19:22:57 +03:00
Douwe Maan	7633d60268	Include snippet author in recipients of snippet note notification.	2015-04-15 17:57:31 +02:00
Douwe Maan	959ebbcade	Clean up code around commit mentions.	2015-04-15 17:57:31 +02:00
Dmitriy Zaporozhets	345e32d332	Merge branch 'sstanovnik-openssh_fix' into 'master' ... Fix generating SSH key fingerprints with OpenSSH 6.8. Replaces https://github.com/gitlabhq/gitlabhq/pull/9008. Fixes gitlab-org/gitlab-ce#1289. cc @jacobvosmaer See merge request !519	2015-04-15 12:40:30 +00:00
Dmitriy Zaporozhets	089f5b914e	Merge branch 'emailsonpush-hellip' into 'master' ... Don't use HTML ellipsis in EmailsOnPush subject truncated commit message. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2229. Since the page is encoded as UTF-8, we don't need HTML entities anymore and can just use the character. See merge request !521	2015-04-15 12:37:19 +00: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
Douwe Maan	b409c37671	Merge branch 'fix-stuck-mr' into 'master' ... fix stuck mr If `locked?` & `locked_at.nil?` is nil return that the merge has been locked long enough and those are old merges stuck in locked state. Fixes #348. Related to 6487419364. Replaces !517. /cc @DouweM See merge request !526	2015-04-15 09:50:46 +00:00
Douwe Maan	63b21945d2	Merge branch 'google-code-import' into 'master' ... Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( ♥️ @o9000). ### To do - [x] List projects from Google Takeout file - [x] Import Git repository - [x] Import issues - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50) - [x] Handle deleted attachments - [x] Handle blockedOn attribute - [x] Add directions on how to get data from Google Takeout ### Import instructions  ### Imported issue  See merge request !471	2015-04-15 06:53:42 +00:00
Ben Bodenmiller	f517dd2606	fix stuck mr ... fixes #348. related to 6487419364.	2015-04-14 23:11:13 -07:00
Douwe Maan	c1531fe1d8	Add spinach tests around accepting and declining invitations.	2015-04-14 18:04:29 +02:00
Douwe Maan	5662b24132	Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.	2015-04-14 16:32:11 +02:00
Douwe Maan	cb5362e7ce	Follow newline guidelines.	2015-04-14 15:16:00 +02:00
Dmitriy Zaporozhets	ef8d96e5de	Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: LICENSE app/assets/javascripts/dispatcher.js.coffee app/controllers/help_controller.rb app/models/user.rb app/views/groups/group_members/_new_group_member.html.haml config/gitlab.yml.example config/routes.rb features/groups.feature features/steps/dashboard/help.rb	2015-04-14 15:08:19 +03: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	0013ea5130	Remove duplication between Group and ProjectMember.	2015-04-14 12:41:19 +02:00
Douwe Maan	e50556fcc8	Let invites be declined.	2015-04-14 12:08:11 +02:00
Douwe Maan	1c0824f451	Correctly import invited members.	2015-04-14 12:08:11 +02:00
Douwe Maan	87dd3f215f	Let members be invited from Add members pane.	2015-04-14 12:08:10 +02:00
Douwe Maan	717fa136a5	Add emails around invitation.	2015-04-14 12:08:10 +02:00
Douwe Maan	39f389ae0f	Add invites controller.	2015-04-14 12:07:33 +02:00
Douwe Maan	629fa7fbe3	Add invite logic to Member.	2015-04-14 12:06:43 +02:00
Douwe Maan	2b2bd402dc	Track who created a group or project member.	2015-04-14 12:06:42 +02:00
Douwe Maan	ff3caad4ca	Rename manage_group ability to admin_group for consistency with project.	2015-04-14 12:05:49 +02:00
Dmitriy Zaporozhets	9311f86291	Merge branch 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/assets/javascripts/api.js.coffee app/assets/javascripts/users_select.js.coffee	2015-04-14 13:05:39 +03:00
Douwe Maan	1221bec56c	Refactor key fingerprint generation.	2015-04-14 12:00:43 +02:00
Douwe Maan	ae6d0aaae0	Revert "Merge branch 'fix-stuck-mr' into 'master'" ... This reverts commit 79b4d0b0c0, reversing changes made to a1e147ce22.	2015-04-14 11:03:23 +02:00
Ben Bodenmiller	fb1cd0a842	fix stuck MR ... fixes #348. related to 6487419364.	2015-04-14 00:15:34 -07:00
Dmitriy Zaporozhets	4ab717ea6a	Merge branch 'ldap_migration' ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb	2015-04-13 17:18:02 +03:00