Commit Graph
14761 Commits
Author SHA1 Message Date
Douwe Maan d66148ef39 Merge branch 'fix_email_images' into 'master'
Fix email images

## Dependencies:
This MR Depends on gitlab-org/html-pipeline-gitlab!4 being **merged and published** to rubygems.org

## What does this MR do?
This MR fixes the broken images in emails that occured scince we introduced access control for all attachments in 7.8.
The access control lead to broken images, because the user usually isn't logged into gitlab when opening the email in his mail client.
The solution to fix this, is to replace all images that were uploaded to gitlab as attachemnts with inline images in emails.

I only added one test for images in notes, because all notes share the same view. If it works fine for a note on a commit, then it'll also work the same for notes on a MR or on issues.

@DouweM can you review this please?

Closes #1161

See merge request !373
2015-03-12 17:40:17 +00:00
Dmitriy Zaporozhets cdb64a81a8 Add items into changelog 2015-03-12 10:20:24 -07:00
Dmitriy Zaporozhets 1065f3d30b Merge branch 'github-org-repos' into 'master'
Fix missing GitHub organisation repositories on import page.

Private repositories belonging to organizations rather than users can't be imported because `client.repos(org.login)` was requesting `/users/:org_login/repos` (which only returns public org repo's), while we need `/orgs/:org_login/repos` (which includes both public and private). The `client.org_repos` method does this.

cc @marin This is a bug in 7.8.x, but I'm not sure if it needs a minor release now or if it can go in 7.9.

See merge request !1683
2015-03-12 17:13:25 +00:00
Dmitriy Zaporozhets 59621e9034 Merge branch 'blue-theme' into 'master'
Add blue theme to GitLab

See merge request !1682
2015-03-12 17:09:55 +00:00
Marin Jankovski 5d27b23ddd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-12 09:39:16 -07:00
Marin Jankovski 35124fd54a Merge branch 'emoji_cheatsheet_fix' into 'master'
Emoji cheatsheet fix

Worked through the help text for emoji to properly reference and use EmojiOne tags. Removed the ninja and reworked the first sentence a bit, as ninja isn't supported by EmojiOne. Should resolve ticket #953.

See merge request !384
2015-03-12 16:38:48 +00:00
Marin Jankovski ec1c30ceec Merge branch 'hover_toggle_sidebar'
Conflicts:
	app/assets/stylesheets/generic/nav_sidebar.scss
2015-03-12 09:32:52 -07:00
Dmitriy Zaporozhets d377e94b35 Merge branch 'refactoring_group_controllers' into 'master'
Group controllers refactoring

Usefulness of this refactoring is not so obvious on CE codebase. But It will allow us to remove huge amount of code on the EE side.

See merge request !1684
2015-03-12 16:11:51 +00:00
Cameron Banga fff34a7f4d Updated help documentation to properly reference EmojiOne. [ci skip] 2015-03-12 10:49:46 -05:00
Valery Sizov 0b38c3e041 group controller refactoring 2015-03-12 17:08:48 +02:00
Douwe Maan 3175438f02 Fix missing GitHub organisation repositories on import page. 2015-03-12 13:47:15 +01:00
Hannes Rosenögger 3c7e0f45c2 replace images in emails with inline images
This adds the functionality of replacing all images that were uploaded
to gitlab with inline images(base64) in emails.
This change fixes the broken images in emails that 7.8 introduced
2015-03-12 09:26:06 +01:00
Dmitriy Zaporozhets 158507d942 Add blue theme to GitLab 2015-03-11 21:29:11 -07:00
Marin Jankovski 3f823068e1 Add deploy to ci.gitlab.com to release documents. 2015-03-11 21:11:32 -07:00
Dmitriy Zaporozhets f29a7ce51f Merge branch 'markdown-smb-link' into 'master'
Allow smb:// links in Markdown text.

As requested by Sam McLeod at https://gitlab.com/gitlab-org/gitlab-ce/issues/1184

See merge request !1669
2015-03-12 03:57:52 +00:00
Dmitriy Zaporozhets 85e3b25c04 Merge branch 'new-emoji' into 'master'
Update html-pipeline and emoji

See merge request !1680
2015-03-12 03:44:36 +00:00
Dmitriy Zaporozhets ccc2c6e762 Fix Gemfile.lock 2015-03-11 18:03:21 -07:00
Dmitriy Zaporozhets c02d891cb5 Merge branch 'master' into new-emoji
Conflicts:
	Gemfile.lock
2015-03-11 18:02:37 -07:00
Sytse Sijbrandij f186b20cb2 Merge branch 'ami-to-update-guides' into 'master'
add AMI update step

See merge request !1677
2015-03-12 00:56:25 +00:00
Dmitriy Zaporozhets d0e11f37e3 Merge branch 'reduce-notice-count' into 'master'
Remove annoying notice messages when create/update merge request

See merge request !1681
2015-03-12 00:55:06 +00:00
Dmitriy Zaporozhets d6dda952b8 Fix tests for emojione 2015-03-11 17:52:02 -07:00
Marin Jankovski 66384d7d44 Add a note about building AMI to security doc 2015-03-11 17:50:02 -07:00
Dmitriy Zaporozhets bba1422309 Merge branch 'bump_gitlab_git' into 'master'
Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues

For gitlab/gitlab_git!24

See merge request !1679
2015-03-12 00:43:26 +00:00
Dmitriy Zaporozhets 5f40253f76 Remove annoying notice messages when create/update merge request 2015-03-11 16:07:33 -07:00
Dmitriy Zaporozhets d2d709a252 Update html-pipeline and emoji 2015-03-11 16:05:01 -07:00
Dmitriy Zaporozhets 5c4f567ea0 Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues 2015-03-11 13:52:55 -07:00
Marin Jankovski 88e4aed9df Update changelog for 7.8.4. 2015-03-11 13:03:23 -07:00
Marin Jankovski 1647994ada Merge branch 'fix-code-preview' into 'master'
Fix code preview theme setting for comments, issues, merge requests, and snippets

User color scheme was not being used: default white color scheme was always chosen. Also, default background for code in notes was always overriding the user color scheme.

Closes #1139

See merge request !357
2015-03-11 18:41:36 +00:00
Dmitriy Zaporozhets b2f6567961 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-11 09:57:59 -07:00
Dmitriy Zaporozhets e349ca1353 Merge branch 'ldap-filter-eq' into 'master'
Escape wildcards when searching LDAP by username.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2086.

Also see https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/344 and https://dev.gitlab.org/gitlab/omniauth-ldap/merge_requests/2.

See merge request !1644
2015-03-11 16:57:28 +00:00
Dmitriy Zaporozhets 8cebbea7c2 Merge branch 'issues_url' into 'master'
Remove placeholder methods to prevent calling methods rather than attributes.

Since we have https://dev.gitlab.org/gitlab/gitlabhq/blob/7-8-stable/app/models/service.rb#L79 makes no sense to have methods as a placeholder.

See merge request !1676
2015-03-11 16:56:58 +00:00
Dmitriy Zaporozhets d12a6ac49a Merge branch 'dashboard-restyle' into 'master'
Dashboard restyle

For #2069

See merge request !1675
2015-03-11 16:56:01 +00:00
Hannes Rosenögger b0c1bc6657 Merge branch 'generate-valid-json' into 'master'
Generate valid json

This patch helps to be compatible to other programing languages as it improves the validation of hook data. It seems only ruby can handle 'nil' as value while other json decode function will fatal.

See merge request !182
2015-03-11 16:53:10 +00:00
Douwe Maan 11e966d7a9 Add changelog item. 2015-03-11 17:43:40 +01:00
Job van der Voort 536d437373 add AMI update step 2015-03-11 17:31:39 +01:00
Dmitriy Zaporozhets 9ed71f77fe Remove tests for un-existing page 2015-03-10 23:34:18 -07:00
Hannes Rosenögger 94affe6d51 Merge branch 'master' into 'master'
Make email display name configurable

#216

See merge request !80
2015-03-11 05:41:58 +00:00
Dmitriy Zaporozhets 4b1bb42bf7 Fix tests for project removing 2015-03-10 21:56:19 -07:00
Vyacheslav Slinko 61ed518781 Make email display name configurable 2015-03-11 11:04:23 +07:00
Marin Jankovski 6d0ff0ade8 Remove placeholder methods to prevent calling methods rather than attributes. 2015-03-10 18:09:13 -07:00
Dmitriy Zaporozhets c621a7712b Merge branch 'fix-forms' into 'master'
Fix features checkboxes at admin settings page

For !1615

See merge request !1674
2015-03-11 01:00:35 +00:00
Dmitriy Zaporozhets 9839d106c4 Rename dashboard landing page to Your projects 2015-03-10 16:06:30 -07:00
Dmitriy Zaporozhets 0414b2ae98 Remove projects page from dashboard 2015-03-10 16:03:37 -07:00
Dmitriy Zaporozhets 83f7e98d9a Add project filter by visibility and tag to explore page 2015-03-10 15:59:14 -07:00
Dmitriy Zaporozhets 8527e8d599 Fix test for creating group from dashboard 2015-03-10 15:19:28 -07:00
Dmitriy Zaporozhets 04c674e679 Cleanup after removing group tab from dashboard aside 2015-03-10 13:27:58 -07:00
Dmitriy Zaporozhets 7fd4dc1e11 Remove group rendering from dashboard page 2015-03-10 13:17:16 -07:00
Dmitriy Zaporozhets f0a132ed99 Merge branch 'active-users-check' into 'master'
Active users check

For gitlab/gitlab-ee#248

See merge request !1673
2015-03-10 20:04:26 +00:00
Dmitriy Zaporozhets ea7478d6b5 Fix features checkboxes at admin settings page 2015-03-10 12:59:39 -07:00
Dmitriy Zaporozhets c572bdb587 Add CHANGELOG item about db migration 2015-03-10 12:10:26 -07:00