| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Remove duplicate settings for default_url_options
Closes #2269
See merge request !1797
|
| | |
| |
| |
| | |
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
|
| |\ \
| | |
| | | |
Add api version property on hipchat service
|
| | | | |
|
| |/ /
| |
| |
| | |
This reverts commit 548f182814acd0f7a110e6c165c186e345901b00.
|
| |\ \ |
|
| | |/ |
|
| |\ \ |
|
| | |\ \
| | | |
| | | | |
Add X-GitLab-Event header for web hooks
|
| | | |/ |
|
| | |/
| |
| |
| |
| |
| | |
When notify is set to true send messages will trigger a notification for
all room members.
Color changes the background color of the message.
|
| |/
|
|
|
| |
Add new global application settings for default project and snippet
visibility levels.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix bug where Slack service channel was not saved in admin template settings
Consolidate allowed parameters in one place to avoid these kinds of bugs in the future.
Closes https://github.com/gitlabhq/gitlabhq/issues/9181
Closes #1501
See merge request !574
|
| | |
| |
| |
| |
| |
| | |
Consolidate allowed parameters in one place to avoid these kinds of bugs in the future.
Closes https://github.com/gitlabhq/gitlabhq/issues/9181
|
| |\ \
| |/
|/|
| |
| |
| | |
Simplify the `skip_before_action` logic for UploadsController
See merge request !547
|
| | | |
|
| | | |
|
| | | |
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Redirect to sign in page after signing out.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2125.
See merge request !541
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/snippets_controller.rb
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/import/google_code_controller.rb
|
| | | | | |
|
| | |/ /
| | |
| | |
| | | |
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
| |/ / |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Clean up code around commit mentions.
Builds upon !527.
See merge request !528
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | | |
|
| | | | | |
|
| | |/ /
| | |
| | |
| | |
| | | |
This commit removes the access control for uploaded images.
This is needed to display the images in emails again.
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | | |
Revert and re-fix image rendering in help pages
Closes #2212
See merge request !1765
|
| | | | |
|
| | | | |
|
| | |/
| |
| |
| | |
This reverts commit d365004e684e98459061fcd5fbaf9bea880934a8.
|
| |/ |
|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | | |
Don't crash when project repository doesn't exist.
See merge request !524
|
| | | | |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
