Job van der Voort
d5c71c834e
Version 7.10.1
2015-04-29 16:40:28 +02:00
Valery Sizov and Dmitriy Zaporozhets
5dd1deb2b0
Remove abandoned GroupMembers
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
db/schema.rb
2015-04-29 14:30:45 +03:00
Job van der Voort
a651951723
Version 7.10.0
2015-04-22 16:15:44 +02:00
Dmitriy Zaporozhets and Dmitriy Zaporozhets
2c8c782b7e
Merge branch 'rs-issue-2257' into 'master'
...
Recover from URI::Error
`URI::Error` is the base class for all URI errors.
Fixes #2257 and #2260
See merge request !1789
2015-04-22 16:06:07 +03:00
Dmitriy Zaporozhets
20a66988d8
Merge branch 'rs-toggle-tab' into 'master'
...
Fix tab behavior on MergeRequests#new
Missed this one in 269aee790c!556
2015-04-22 15:11:09 +03:00
Dmitriy Zaporozhets
36c5277791
Merge branch 'update_grack' into 'master'
...
Update gitlab-grack to 2.0.2.
Updating to grack version 2.0.2 to fix an issue with smart http clients.
See merge request !559
2015-04-22 15:10:42 +03:00
Job van der Voort
3e913e4cd5
Version 7.10.0.rc8
2015-04-21 17:39:33 +02:00
Dmitriy Zaporozhets
0625b15a48
Merge branch '7-10-rc5' into '7-10-stable'
...
7.10.0.rc5
cc @job
See merge request !1787
2015-04-21 13:41:11 +00:00
Dmitriy Zaporozhets
abdc4cbef2
Merge branch 'upgrade-guide-gitlab-shell' into 'master'
...
7.10 requires gitlab-shell 2.6.2.
Fixes #1467 .
See merge request !552
2015-04-21 15:53:35 +03:00
Dmitriy Zaporozhets
adcc204948
Merge branch 'gitlab-grack-2.0.1' into 'master'
...
Update gitlab-grack to 2.0.1 to get unicorn to stop creating zombies.
Addresses #1461 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2253 .
This regression was introduced between 7.9 and the 7.10 rcs, so no changelog item for 7.10 proper.
cc @JobV @jacobvosmaer
See merge request !546
2015-04-21 15:49:23 +03:00
Dmitriy Zaporozhets
7915e74d3c
Merge branch 'google-code-fixes' into 'master'
...
Fix some issues with Google Code importer
Thanks, @mrtux, for reporting all of these.
See merge request !551
2015-04-21 15:47:45 +03:00
Dmitriy Zaporozhets and Dmitriy Zaporozhets
34192f2cf9
Merge branch 'rs-issue-2212' into 'master'
...
Revert and re-fix image rendering in help pages
Closes #2212
See merge request !1765
2015-04-21 15:47:23 +03:00
Job van der Voort
81112b5405
Version 7.10.0.rc4
2015-04-20 16:25:16 +02:00
Dmitriy Zaporozhets
f6f0a13a8b
Merge branch '7-10-rc4' into '7-10-stable'
...
Changes for 7.10.0.rc4
cc @job @douwe
See merge request !1785
2015-04-20 13:17:56 +00:00
Dmitriy Zaporozhets
8e4b8e20ef
Merge branch 'revert-username-period' into 'master'
...
Revert disallowing usernames to end in period.
cc @JobV @jacobvosmaer
See merge request !545
2015-04-20 15:30:54 +03:00
Dmitriy Zaporozhets
407489d606
Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master'
...
Remove access control for uploaded images to fix broken images in emails
Replaces !530 .
> This MR removes the access control for uploaded images. This is needed to display the images in emails again.
>
> The previous solution to base64 encode the images had to be reverted, because not all email clients supported it.
>
> If possible this should go into the 7.10 release.
See merge request !533
2015-04-20 12:48:25 +03:00
Dmitriy Zaporozhets and Dmitriy Zaporozhets
59e3832b6e
Merge branch 'fix-label-color' into 'master'
...
Parse GFM references after sanitizing
Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`. See #2188 .
See merge request !1745
2015-04-20 12:39:39 +03:00
Douwe Maan and Dmitriy Zaporozhets
5bbd2b8c46
Ignore submodules that are defined in .gitmodules but are checked in as directories.
2015-04-20 12:37:35 +03:00
Roshan Gautam and Dmitriy Zaporozhets
d011527a36
Fix Resource Owner Password Authentication Flow
2015-04-20 12:33:52 +03:00
Dmitriy Zaporozhets
dfc5680b1c
Merge branch 'fix-label-color-input' into 'master'
...
Fix label color input.
Because `value` was set, every label color would render as purple in the form.
Introduced by 83b5a9ae2b!538
2015-04-20 12:32:48 +03:00
Job van der Voort
4df7c7912f
Version 7.10.0.rc3
2015-04-20 10:58:31 +02:00
Dmitriy Zaporozhets
39b8d9e715
Merge branch '7-10-rc3' into '7-10-stable'
...
Fixes for 7.10.0.rc3
content
- [ ] Update gitlab_git to ignore invalid lines in .gitmodules.
- [ ] Add a task that checks repository integrity with `git fsck`.
- [ ] Decrease memory use and increase performance of Google Code importer.
- [ ] Fix username period migration to preserve uniqueness of names and paths.
See merge request !1783
2015-04-17 15:20:10 +00:00
Dmitriy Zaporozhets
8b4b687d44
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 17:34:48 +03:00
Douwe Maan and Dmitriy Zaporozhets
047dacc700
Update gitlab_git to ignore invalid lines in .gitmodules.
2015-04-17 14:38:52 +03:00
Vinnie Okada and Dmitriy Zaporozhets
a7be1ad143
Add new rake task
...
Add a task that checks repository integrity with `git fsck`.
2015-04-17 14:35:42 +03:00
Douwe Maan and Dmitriy Zaporozhets
b6d01abc02
Fix username period migration to preserve uniqueness of names and paths.
2015-04-17 14:33:34 +03:00
Job van der Voort
743f3ed60c
Version 7.10.0.rc2
2015-04-16 15:12:32 +02:00
Dmitriy Zaporozhets
e24ed47f8f
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-04-16 15:29:43 +03: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
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
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
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
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
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
