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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update bullet 5.2.0 -> 5.5.1	Robert Speicher	2017-03-25	2	-3/+3
\|
*	Update brakeman 3.4.1 -> 3.6.1	Robert Speicher	2017-03-25	2	-3/+3
\|
*	Remove web-console gem	Robert Speicher	2017-03-25	2	-7/+0
\|
*	Update better_errors 1.0.1 -> 2.1.1	Robert Speicher	2017-03-25	2	-4/+5
\|
*	Merge branch 'fix-up-emoji-tests' into 'master'	Alfredo Sumaran	2017-03-25	5	-6/+6
\|\ \| \| \| \| \| \| \| \|	Fix up emoji tests that should be failing See merge request !10231
\| *	Fix up emoji tests that should have failed :/	Eric Eastwood	2017-03-24	5	-6/+6
\|/ \| \| \| \| \| \|	Some discussion, https://gitlab.slack.com/archives/C0GQHHPGW/p1490398531185144 -> MR to fix failing emoji test: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10230
*	Merge branch '30035-milestone-with-due-date-shows-escaped-html' into 'master'	Alfredo Sumaran	2017-03-24	2	-0/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Milestone with due date shows escaped HTML" Closes #30035 See merge request !10224
\| *	add CHANGELOG.md entry for !10224	Mike Greiling	2017-03-24	1	-0/+4
\| \|
\| *	prevent formatted milestone date string from having html escaped	Mike Greiling	2017-03-24	1	-0/+2
\| \|
* \|	Merge branch '28634-todos-margin' into 'master'	Alfredo Sumaran	2017-03-24	3	-2/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra margin at bottom of todos page Closes #28634 See merge request !10222
\| * \|	Remove extra margin at bottom of todos page	Annabel Dunstone Gray	2017-03-24	3	-2/+9
\| \| \|
* \| \|	Merge branch '23862-fix-group-project-count' into 'master'	Alfredo Sumaran	2017-03-24	3	-1/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding non_archived scope for counting projects Closes #23862 See merge request !8305
\| * \| \|	Adding non_archived scope for counting projects	Naveen Kumar	2017-03-24	3	-1/+25
\|/ / /
* \| \|	Merge branch '28614-harmonious-color-palette' into 'master'	Annabel Dunstone Gray	2017-03-24	23	-221/+249
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change full colors to a more harmonious palette Closes #28614 See merge request !10154
\| * \| \|	Change full colors to a more harmonious palette	Pedro Moreira da Silva	2017-03-23	23	-221/+249
\| \| \| \|
* \| \| \|	Merge branch 'add-issue-modal-loading-indicator' into 'master'	Alfredo Sumaran	2017-03-24	4	-5/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show loading icon when changing filter in add issues modal Closes #29615 See merge request !10043
\| * \| \| \|	Show loading icon when changing filter in add issues modal	Phil Hughes	2017-03-21	4	-5/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #29615
* \| \| \| \|	Merge branch '27910-admin-can-create-project-in-all-groups' into 'master'	Rémy Coutable	2017-03-24	4	-2/+45
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Gitlab administrator cannot create projects in every group" Closes #27910 See merge request !9255
\| * \| \| \| \|	Resolve "Gitlab administrator cannot create projects in every group"	George Andrinopoulos	2017-03-24	4	-2/+45
\|/ / / / /
* \| \| \| \|	Merge branch '29897-remove-force-scroll-for-mr-changes-diff' into 'master'	Annabel Dunstone Gray	2017-03-24	2	-3/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove forced scroll into view when switching to "Changes" MR tab Closes #29897 See merge request !10194
\| * \| \| \| \|	Remove forced scroll into view when switching to "Changes" MR tab	Eric Eastwood	2017-03-23	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29897
* \| \| \| \| \|	Merge branch 'rs-ignore-nokogiri-advisory' into 'master'	Sean McGivern	2017-03-24	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Temporarily ignore Nokogiri CVE-2016-4658 See merge request !10218
\| * \| \| \| \|	Temporarily ignore Nokogiri CVE-2016-4658	Robert Speicher	2017-03-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/29992 for progress on updating this gem. In the meantime, we can't do anything about it quickly, so we'll ignore the CVE in `bundle-audit`
* \| \| \| \| \|	Merge branch 'fix-multiple-fixtering' into 'master'	Clement Ho	2017-03-24	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reset dropdown list when clicking filter input Closes #28463 See merge request !10132
\| * \| \| \| \| \|	Reset dropdown list when clicking filter input	Alfredo Sumaran	2017-03-21	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'projects-list-line-breaks' into 'master'	Annabel Dunstone Gray	2017-03-24	4	-65/+70
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes project list lines breaking Closes #29018 See merge request !10178
\| * \| \| \| \| \|	Fixed commit message in forks list not truncating	Phil Hughes	2017-03-24	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use project-row class instead of child selector	Phil Hughes	2017-03-23	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixes project list lines breaking	Phil Hughes	2017-03-23	4	-66/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will only hapen in certain situations ie. when the star count is a lot. We were previously fixing it by hard coding a max-width. This changes it to use flexbox which allows the content to decide when it should be truncated. The rows don't always need truncating, so we shouldn't hard code a width. Closes #29018
* \| \| \| \| \| \|	Merge branch 'slow-search-changelog' into 'master'	Yorick Peterse	2017-03-24	1	-0/+4
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add changelog for !10053 See merge request !10214
\| * \| \| \| \| \|	add changelog for !10053	mhasbini	2017-03-24	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '29880-refactor-sidebar-hacks' into 'master'	Annabel Dunstone Gray	2017-03-24	10	-19/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Move sub_nav content above the content-wrapper class" Closes #29880 See merge request !10163
\| * \| \| \| \| \| \|	update sub-nav selector in user_requests_access_spec	Mike Greiling	2017-03-23	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	adjust the affix breakpoint to match css top value	Mike Greiling	2017-03-22	3	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	genericise sidebar vertical offset css as it relates to the subnav	Mike Greiling	2017-03-22	2	-6/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	remove jobs page hack to make subnav 100% width	Mike Greiling	2017-03-22	4	-9/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	remove unnecessary string interpolation	Mike Greiling	2017-03-22	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/bump-gitaly-version-to-0-4-0' into 'master'	Robert Speicher	2017-03-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Gitaly server version to v0.4.0 See merge request !10211
\| * \| \| \| \| \| \| \|	Bump Gitaly server version to v0.4.0	Ahmad Sherif	2017-03-24	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '22145-slow-search' into 'master'	Yorick Peterse	2017-03-24	2	-11/+8
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify projects, merge requests search queries See merge request !10053
\| * \| \| \| \| \| \| \|	simplify projects, mrs search queries	mhasbini	2017-03-22	2	-11/+8
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'improve-ee_check_compat-again' into 'master'	Sean McGivern	2017-03-24	2	-110/+190
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch deeper the tested branch before fetching master See merge request !9484
\| * \| \| \| \| \| \| \|	Put banners in constants	Rémy Coutable	2017-03-23	1	-29/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Fetch deeper the tested branch before fetching master	Rémy Coutable	2017-03-23	2	-101/+183
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The tested branch is clone with a deep of 20 so if it has more than 20 commits, we need to deepen its hitory to be able to find the merge-base with origin/master. Also, detect prefixed EE branch as well, i.e. `ee-<branch>`. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'gitlab-workhorse-1.4.2' into 'master'	Sean McGivern	2017-03-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-workhorse 1.4.2 See merge request !10205
\| * \| \| \| \| \| \| \| \|	Use gitlab-workhorse 1.4.2	Jacob Vosmaer	2017-03-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes silent failure of `git clone` when Gitaly is not running.
* \| \| \| \| \| \| \| \| \|	Merge branch '29964-sidebar-js' into 'master'	Filipa Lacerda	2017-03-24	2	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add sidebar class to build & wiki pages Closes #29964 See merge request !10196
\| * \| \| \| \| \| \| \| \| \|	Add sidebar class to build & wiki pages	Annabel Dunstone Gray	2017-03-23	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/update-impersonation-tokens' into 'master'	Sean McGivern	2017-03-24	2	-91/+165
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Impersonation tokens docs See merge request !10055
\| * \| \| \| \| \| \| \| \| \|	Remove highlighting language from GET codeblocks	Achilleas Pipinellis	2017-03-23	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]