- 15 Apr, 2015 25 commits
-
-
Dominik Sander authored
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
-
Marin Jankovski authored
Make sure user has access to namespace in import tests. See merge request !529
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
Signed-off-by:Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
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
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
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
-
Dmitriy Zaporozhets authored
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
-
Dmitriy Zaporozhets authored
Add config var to block auto-created LDAP users. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2110. See merge request !522
-
Dmitriy Zaporozhets authored
Don't crash when project repository doesn't exist. See merge request !524
-
Dmitriy Zaporozhets authored
Don't leak existence of group or project via search. Fixes gitlab/gitlab-ee#266. See merge request !1762
-
Dmitriy Zaporozhets authored
Update gemnasium-gitlab-service to 0.2.6
-
Dmitriy Zaporozhets authored
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
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
-
Douwe Maan authored
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 64874193. Replaces !517. /cc @DouweM See merge request !526
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Revert help link Revert for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/483 cc @douwe See merge request !1776
-
Dmitriy Zaporozhets authored
Signed-off-by: -
Dmitriy Zaporozhets authored
This reverts commit 6fe26e3e.
-
Douwe Maan authored
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 -
Dmitriy Zaporozhets authored
Remove truncation from issue titles on milestone page
-
Ben Bodenmiller authored
fixes #348. related to 64874193.
-
Robert Schilling authored
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
-
- 14 Apr, 2015 15 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
-
Douwe Maan authored
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
Fix ldap migration We need different queries for MySQL and Postgres. See merge request !1771
-
Dmitriy Zaporozhets authored
Signed-off-by: -
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Ui improvements See merge request !1772
-
Douwe Maan authored
-
Douwe Maan authored
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
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
Signed-off-by:
-
