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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Updated help documentation to properly reference EmojiOne. [ci skip]	Cameron Banga	2015-03-12	2	-10/+11
\|
*	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
\|/ /
* \|	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
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename dashboard landing page to Your projects	Dmitriy Zaporozhets	2015-03-10	3	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove projects page from dashboard	Dmitriy Zaporozhets	2015-03-10	6	-108/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add project filter by visibility and tag to explore page	Dmitriy Zaporozhets	2015-03-10	8	-144/+88
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix test for creating group from dashboard	Dmitriy Zaporozhets	2015-03-10	4	-27/+27
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Cleanup after removing group tab from dashboard aside	Dmitriy Zaporozhets	2015-03-10	2	-40/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove group rendering from dashboard page	Dmitriy Zaporozhets	2015-03-10	6	-46/+6
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-forms' into 'master'	Dmitriy Zaporozhets	2015-03-11	1	-16/+24
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix features checkboxes at admin settings page For !1615 See merge request !1674
\| * \| \| \| \| \|	Fix features checkboxes at admin settings page	Dmitriy Zaporozhets	2015-03-10	1	-16/+24
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'active-users-check' into 'master'	Dmitriy Zaporozhets	2015-03-10	2	-0/+6
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Active users check For gitlab/gitlab-ee#248 See merge request !1673
\| * \| \| \| \|	Update CHANGELOG	Dmitriy Zaporozhets	2015-03-10	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add active users to gitlab:check	Dmitriy Zaporozhets	2015-03-10	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Add CHANGELOG item about db migration	Dmitriy Zaporozhets	2015-03-10	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-10	6	-4/+47
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'upgrade-dockerfile' into 'master'	Robert Schilling	2015-03-10	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Docker build to GitLab v7.8.3 Upgrading from GitLab v7.8.1. Pretty simple change, tested with a quick Docker build. See merge request !380
\| \| * \| \| \| \| \|	Upgrade Docker image to GitLab v7.8.3	Stan Hu	2015-03-10	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into 'master'	Hannes Rosenögger	2015-03-10	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added link generation for LinkedIn on user's Profile page This is a very very minor change. Added a generated link to the LinkedIn portion of the user's profile. See merge request !377
\| \| * \| \| \| \| \|	Added a link_to for the LinkedIn portion of the user's profile. It felt odd ↵	Ben Carson	2015-03-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to me, having this section not being an active link like the rest of the entries on the page.
\| * \| \| \| \| \| \|	Merge branch 'fix-import-redirect' into 'master'	Hannes Rosenögger	2015-03-10	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing import redirect loop While importing, don't redirect import actions to the project page, even if the repository exists Fixes #1191 See merge request !379
\| \| * \| \| \| \| \| \|	Fixing import redirect loop	DJ Mountney	2015-03-09	1	-1/+1
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While importing, don't redirect import actions to the project page, even if the repository exists
\| * \| \| \| \| \| \|	Merge branch 'fix-commit-calendar-emails' into 'master'	Douwe Maan	2015-03-10	3	-1/+44
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix commit calendar to use all user emails This MR improves upon Hannes Rosenögger's changes: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/364 See merge request !378
\| \| * \| \| \| \| \|	This MR extends the commit calendar so it searches for commits made with ↵	Stan Hu	2015-03-09	3	-1/+44
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	every email address the user has associated with his account. This fixes one of the problems mentioned in gitlab-org/gitlab-ce#1162 and makes the behavior of the commit calendar as described in the profile. "All email addresses will be used to identify your commits."
* \| \| \| \| \| \|	Merge branch 'fix_importers' into 'master'	Dmitriy Zaporozhets	2015-03-10	4	-14/+42
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix importers with OCC Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1180 Using validates_uniqueness_of does not guarantee the absence of duplicate record insertions. When users click button "import all" it will create duplicating group in database and data integrity will be broken. http://api.rubyonrails.org/classes/ActiveRecord/Validations/ClassMethods.html#method-i-validates_uniqueness_of I use optimistic concurrency control for handling this situation. See merge request !1647
\| * \| \| \| \| \| \|	remove duplication	Valery Sizov	2015-03-10	2	-2/+23
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix importers with OCC	Valery Sizov	2015-03-10	3	-14/+21
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'uploads-authorization' into 'master'	Dmitriy Zaporozhets	2015-03-10	3	-16/+329
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reject access to group/project avatar if the user doesn't have access. Closes #2050. I'll add tests for EE logos once this is merged here and merged into EE. See merge request !1671
\| * \| \| \| \| \| \|	Reject access to group/project avatar if the user doesn't have access.	Douwe Maan	2015-03-10	3	-16/+329
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'fix-line-highlight' into 'master'	Dmitriy Zaporozhets	2015-03-10	7	-9/+10
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix highlight of selected lines * show color for highlighted line * fix overflow by header See merge request !1672