delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-12	6	-6/+108
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix_email_images' into 'master'	Douwe Maan	2015-03-12	6	-6/+108
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \|	replace images in emails with inline images	Hannes Rosenögger	2015-03-12	6	-6/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \| \|	Merge branch 'improve-import-page' into 'master'	Dmitriy Zaporozhets	2015-03-12	6	-9/+56
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Style improvements to import page See merge request !1685
\| * \| \| \| \| \| \| \|	Style improvements to import page	Dmitriy Zaporozhets	2015-03-12	6	-9/+56
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Add items into changelog	Dmitriy Zaporozhets	2015-03-12	1	-3/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'github-org-repos' into 'master'	Dmitriy Zaporozhets	2015-03-12	3	-3/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Fix missing GitHub organisation repositories on import page.	Douwe Maan	2015-03-12	3	-3/+7
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'blue-theme' into 'master'	Dmitriy Zaporozhets	2015-03-12	4	-1/+18
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add blue theme to GitLab See merge request !1682
\| * \| \| \| \| \| \| \|	Add blue theme to GitLab	Dmitriy Zaporozhets	2015-03-11	4	-1/+18
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2015-03-12	2	-10/+11
\|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'emoji_cheatsheet_fix' into 'master'	Marin Jankovski	2015-03-12	2	-10/+11
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \| \| \|	Updated help documentation to properly reference EmojiOne. [ci skip]	Cameron Banga	2015-03-12	2	-10/+11
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'hover_toggle_sidebar'	Marin Jankovski	2015-03-12	1	-3/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/assets/stylesheets/generic/nav_sidebar.scss
\| * \| \| \| \| \| \| \| \| \|	Reverting pixel change	Sabba Petri	2015-02-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Breaks navbar
\| * \| \| \| \| \| \| \| \| \|	Fixed up app_logo	Sabba Petri	2015-02-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pixel perfection.
\| * \| \| \| \| \| \| \| \| \|	Added hover state	Sabba Petri	2015-02-25	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And also fixed it being one pixel off.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'refactoring_group_controllers' into 'master'	Dmitriy Zaporozhets	2015-03-12	3	-14/+12
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \|	group controller refactoring	Valery Sizov	2015-03-12	3	-14/+12
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Add deploy to ci.gitlab.com to release documents.	Marin Jankovski	2015-03-11	3	-0/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'markdown-smb-link' into 'master'	Dmitriy Zaporozhets	2015-03-12	4	-1/+12
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	Add changelog item.	Douwe Maan	2015-03-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Allow smb:// links in Markdown text.	Douwe Maan	2015-03-10	3	-1/+11
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'new-emoji' into 'master'	Dmitriy Zaporozhets	2015-03-12	5	-17/+20
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update html-pipeline and emoji See merge request !1680
\| * \| \| \| \| \| \| \| \|	Fix Gemfile.lock	Dmitriy Zaporozhets	2015-03-11	1	-5/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into new-emoji	Dmitriy Zaporozhets	2015-03-11	6	-9/+16
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Gemfile.lock
* \| \| \| \| \| \| \| \| \|	Merge branch 'ami-to-update-guides' into 'master'	Sytse Sijbrandij	2015-03-12	3	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add AMI update step See merge request !1677
\| * \| \| \| \| \| \| \| \| \|	Add a note about building AMI to security doc	Marin Jankovski	2015-03-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	add AMI update step	Job van der Voort	2015-03-11	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'reduce-notice-count' into 'master'	Dmitriy Zaporozhets	2015-03-12	1	-6/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove annoying notice messages when create/update merge request See merge request !1681
\| * \| \| \| \| \| \| \| \| \| \|	Remove annoying notice messages when create/update merge request	Dmitriy Zaporozhets	2015-03-11	1	-6/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'bump_gitlab_git' into 'master'	Dmitriy Zaporozhets	2015-03-12	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues For gitlab/gitlab_git!24 See merge request !1679
\| * \| \| \| \| \| \| \| \| \| \|	Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues	Dmitriy Zaporozhets	2015-03-11	2	-4/+4
\|/ / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \|	Fix tests for emojione	Dmitriy Zaporozhets	2015-03-11	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Update html-pipeline and emoji	Dmitriy Zaporozhets	2015-03-11	3	-14/+15
\| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Update changelog for 7.8.4.	Marin Jankovski	2015-03-11	1	-0/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-code-preview' into 'master'	Marin Jankovski	2015-03-11	10	-4/+40
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \|	Fix code preview theme setting for comments, issues, merge requests, and ↵	Stan Hu	2015-03-10	10	-4/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	snippets. Also preserve code preview color scheme in events dashboard. Assign default colors to all code blocks shown as <pre class="code highlight [color_scheme]"> Closes #1139
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-11	7	-3/+10
\|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'generate-valid-json' into 'master'	Hannes Rosenögger	2015-03-11	3	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \| \| \| \| \|	Generate valid json for hooks	Nicole Cordes	2015-03-10	3	-1/+3
\| \| \| \|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It seems that ruby can handle 'nil' value but other json processors (like PHP) throw an error. This is always generated for empty arrays.
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Hannes Rosenögger	2015-03-11	5	-2/+7
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make email display name configurable #216 See merge request !80
\| \| * \| \| \| \| \| \| \| \| \| \|	Make email display name configurable	Vyacheslav Slinko	2015-03-11	5	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ldap-filter-eq' into 'master'	Dmitriy Zaporozhets	2015-03-11	3	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Escape wildcards when searching LDAP by username.	Douwe Maan	2015-03-06	3	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'issues_url' into 'master'	Dmitriy Zaporozhets	2015-03-11	1	-12/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove placeholder methods to prevent calling methods rather than attributes.	Marin Jankovski	2015-03-10	1	-12/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dashboard-restyle' into 'master'	Dmitriy Zaporozhets	2015-03-11	28	-384/+126
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dashboard restyle For #2069 See merge request !1675
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove tests for un-existing page	Dmitriy Zaporozhets	2015-03-10	1	-9/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tests for project removing	Dmitriy Zaporozhets	2015-03-10	2	-6/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|