| Age | Commit message (Collapse) | Author |
|---|
|
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
|
Bootlint integration
|
|
Clean up code around commit mentions.
Builds upon !527.
See merge request !528
|
|
* Simplify new repo commands
* Include directions for how to add an existing folder that is either
already a repo or not yet a repo
Replaces #7918.
|
|
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
|
|
do not prepend relative_url_root to avatar
|
|
Fix label color input.
Because `value` was set, every label color would render as purple in the form.
Introduced by 83b5a9ae2bfb594bcb5a9a931d6781ba05c9b9ef between 7.9 and 7.10, so no changelog item.
See merge request !538
|
|
The commit.author.icon variable contains a full URL, which gets broken
when prepended by the relative_url_root setting (generating hrefs like
"/gitlabhttps://...".
|
|
Let Bootstrap's tab JS handle history
Closes #2219
See merge request !1784
|
|
Revert and re-fix image rendering in help pages
Closes #2212
See merge request !1765
|
|
Closes #2219
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
We use `focusin` event instead of `click` because when using the latter,
when the selection is created it isn't put into X11 PRIMARY selection.
And as a Linux user I'm very used to such behaviour that when something
gets selected, it's ready for pasting, which is the primary purpose of
the clone URL field.
When `focusin` is used, the selection is copied to X11 buffer
automatically, so it works as expected (tested in Firefox and Chrome).
|
|
This commit removes the access control for uploaded images.
This is needed to display the images in emails again.
|
|
Fix merge request comments on files with multiple commits
|
|
|
|
|
|
|
|
This reverts commit d365004e684e98459061fcd5fbaf9bea880934a8.
|
|
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
|
|
Should not make a difference most of the time, since if they're participating in the thread, they have access to the project.
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
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
|
|
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
|
|
Don't crash when project repository doesn't exist.
See merge request !524
|
|
Don't leak existence of group or project via search.
Fixes gitlab/gitlab-ee#266.
See merge request !1762
|
|
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
|
|
|
|
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 6487419364fa9c179e24028d85b2be10d574067f. Replaces !517.
/cc @DouweM
See merge request !526
|
|
|
|
This reverts commit 6fe26e3e468ae0b79e2e05b4d4dd608cd9bbcd94.
|
|
Import projects from Google Code.
Resolves #1257.
Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( :hearts: @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
|
|
Remove truncation from issue titles on milestone page
|
|
fixes #348. related to 6487419364fa9c179e24028d85b2be10d574067f.
|
|
|
|
|
|
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
