16993 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	8c72f02261	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	2015-04-16 15:31:55 +03:00
Dmitriy Zaporozhets	e24ed47f8f	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-04-16 15:29:43 +03:00
Job van der Voort	92668d692a	Merge branch 'ce-update-guides' into 'master' ... Ce update guides See merge request !373	2015-04-16 12:28:53 +00:00
Job van der Voort	bf2911685d	update guides for 7.10 ee	2015-04-16 14:28:00 +02:00
Dmitriy Zaporozhets	9042d8d2b2	Merge pull request #9131 from chulkilee/ruby-2.1.6 ... ruby 2.1.6	2015-04-16 15:27:29 +03:00
Jeroen van Baarsen	b18b9a55be	Merge pull request #9094 from bbodenmiller/patch-1 ... update text to reference new location of setting	2015-04-16 14:23:38 +02:00
Job van der Voort	a7760993c6	Merge branch 'update-install-guides-710' into 'master' ... update guides for 7.10 See merge request !1779	2015-04-16 12:19:21 +00:00
Job van der Voort	42237e363b	update guides for 7.10	2015-04-16 14:16:46 +02:00
Dmitriy Zaporozhets	23ea71cb69	Merge branch 'ce-to-ee' into 'master' ... Recent changes from CE master cc @job See merge request !370	2015-04-16 11:34:06 +00:00
Dmitriy Zaporozhets	1a22f0a2b1	Fix audit logging for project deploy keys ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-16 13:58:07 +03:00
Dmitriy Zaporozhets	d209b9793c	Authorization rule manage_group does not exist any more ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-16 13:36:32 +03: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
Marin Jankovski	ed94cde2b2	Merge pull request #9089 from dsander/fix-merge-request-comments ... Fix merge request comments on files with multiple commits	2015-04-15 19:34:38 +02:00
Dmitriy Zaporozhets	135372849d	Fix conflict ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-15 20:22:23 +03:00
Patricio Cano	ab13acbcf2	Merge branch 'doc-ldap-config' into 'master' ... Update documentation for multi-server LDAP The rake task previously mentioned in the docs is obsolete as of 7.9.4. See merge request !369	2015-04-15 17:07:46 +00:00
Dmitriy Zaporozhets	fb7ce7bd13	Merge branch 'fix-mention-notification' into 'master' ... Fix Mention notification level. Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2236. See merge request !527	2015-04-15 16:31:34 +00: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	b73ffbd3cb	Fix for snippets.	2015-04-15 17:57:26 +02:00
Douwe Maan	efe9629346	Fix Mention notification level.	2015-04-15 17:57:26 +02:00
Marin Jankovski	5f78601c8a	Merge branch 'fix-gitorious-test' into 'master' ... Make sure user has access to namespace in import tests. See merge request !529	2015-04-15 15:56:23 +00:00
Douwe Maan	80097606f5	Make sure user has access to namespace in import tests.	2015-04-15 16:58:43 +02:00
Jacob Vosmaer	5d25cff789	Update documentation for multi-server LDAP	2015-04-15 16:56:33 +02:00
Dmitriy Zaporozhets	9193b94ece	No tabs in code! ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-15 16:14:16 +03:00
Dmitriy Zaporozhets	cc41381be4	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-15 15:41:36 +03: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	4c26bcbec8	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-04-15 15:38:56 +03:00
Dmitriy Zaporozhets	d2a895dad8	Merge branch 'emailsonpush-replyto' into 'master' ... Set EmailsOnPush reply-to address to committer email when enabled. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2227. See merge request !520	2015-04-15 12:37:51 +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	4ab22a8c32	Merge branch 'ldap-block_auto_created_users' into 'master' ... Add config var to block auto-created LDAP users. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2110. See merge request !522	2015-04-15 12:36:43 +00:00
Dmitriy Zaporozhets	2705500546	Merge branch 'fix-repository-rescue' into 'master' ... Don't crash when project repository doesn't exist. See merge request !524	2015-04-15 12:36:12 +00:00
Dmitriy Zaporozhets	fccc9454ff	Merge branch 'search-information-leak' into 'master' ... Don't leak existence of group or project via search. Fixes gitlab/gitlab-ee#266. See merge request !1762	2015-04-15 12:35:00 +00:00
Dmitriy Zaporozhets	1970dabea6	Merge pull request #9039 from gemnasium/update-gemnasium-gitlab-service-to-0-2-6 ... Update gemnasium-gitlab-service to 0.2.6	2015-04-15 15:33:09 +03:00
Jacob Vosmaer	6b66c90573	Add 7.9.4-ee packages	2015-04-15 13:36:08 +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
Douwe Maan	3d0c0bd922	Add changelog item.	2015-04-15 12:45:29 +02:00
Dmitriy Zaporozhets	b75866120b	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-15 12:56:25 +03: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
Dmitriy Zaporozhets	3d9cbc5dcb	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-04-15 12:44:59 +03:00
Dmitriy Zaporozhets	4efbf9b6f5	Merge branch 'revert-help-link' into 'master' ... Revert help link Revert for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/483 cc @douwe See merge request !1776	2015-04-15 09:44:30 +00:00
Dmitriy Zaporozhets	5d1ab47bd2	Revert help link tests removal ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-15 12:13:49 +03:00
Dmitriy Zaporozhets	400c9c5ae2	Revert "Removed help link from sidebar" ... This reverts commit 6fe26e3e46.	2015-04-15 12:12:58 +03: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
Dmitriy Zaporozhets	0a0d6050fc	Merge pull request #8905 from jasonblanchard/remove-truncation-milestone ... Remove truncation from issue titles on milestone page	2015-04-15 09:22:46 +03:00
Ben Bodenmiller	f517dd2606	fix stuck mr ... fixes #348. related to 6487419364.	2015-04-14 23:11:13 -07:00
Robert Schilling	61c79418c4	Merge branch 'fix-spinach-unsubscribe-mr-test' into 'master' ... Remove timing dependency on unsubscribe merge request test This test failed for me once. I am now on a mission to remove `sleep` from the spinach tests. See: http://www.elabs.se/blog/53-why-wait_until-was-removed-from-capybara See merge request !523	2015-04-15 06:08:28 +00:00
Douwe Maan	36b54fc04f	Don't crash when project repository doesn't exist.	2015-04-14 23:26:53 +02:00
Douwe Maan	9d00bb0896	Import Google Code issue assignee when mapped.	2015-04-14 23:22:14 +02:00
Douwe Maan	2f797a140b	Skip issue comment when its content, updates and attachments are empty.	2015-04-14 23:13:48 +02:00