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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into ↵	Grzegorz Bizon	2017-04-13	421	-4150/+6738
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/manual-actions-protected-branches-permissions * master: (641 commits) Revert "Fix registry for projects with uppercases in path" Fix registry for projects with uppercases in path Move event icons into events_helper Reset New branch button when issue state changes Add link to environments on kubernetes.md Indent system notes on desktop screens Improve webpack-dev-server compatibility with non-localhost setups. Add changelog entry Fix recent searches icon alignment in Safari Use preload to avoid Rails using JOIN Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error Prepare for zero downtime migrations Fix filtered search input width for IE Fix the `gitlab:gitlab_shell:check` task Fixed random failures with Poll spec Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates Let uses hide verbose output by default Separate examples for each other Collapse similar sibling scenarios Use empty_project for resources that are independent of the repo ... Conflicts: app/views/projects/ci/builds/_build.html.haml
\| *	Merge branch '30642-fix-recent-search-history-icon-alignment-in-safari' into ↵	Clement Ho	2017-04-13	1	-14/+12
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix recent searches icon alignment in Safari Closes #30642 See merge request !10606
\| \| *	Fix recent searches icon alignment in Safari30642-fix-recent-search-history-icon-alignment-in-safari	Eric Eastwood	2017-04-12	1	-14/+12
\| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30642
\| * \|	Merge branch 'rs-fix-already-defined-constant' into 'master'	Douwe Maan	2017-04-12	1	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error See merge request !10664
\| \| * \|	Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition errorrs-fix-already-defined-constant	Robert Speicher	2017-04-12	1	-2/+2
\| \| \| \|
\| * \| \|	Merge branch 'use-avatars-in-activity-view' into 'master'	Douwe Maan	2017-04-12	7	-27/+46
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use avatars instead of icons in activity view See merge request !10596
\| \| * \| \|	Move event icons into events_helperuse-avatars-in-activity-view	Annabel Dunstone Gray	2017-04-12	3	-21/+31
\| \| \| \| \|
\| \| * \| \|	Add helper for using avatars vs icons	Annabel Dunstone Gray	2017-04-11	6	-27/+19
\| \| \| \| \|
\| \| * \| \|	Reuse system notes helper for profile event icons	Annabel Dunstone Gray	2017-04-11	7	-25/+20
\| \| \| \| \|
\| \| * \| \|	Only show icons on profile page; change to case statement	Annabel Dunstone Gray	2017-04-11	4	-18/+21
\| \| \| \| \|
\| \| * \| \|	Use avatars instead of icons in activity view	Annabel Dunstone Gray	2017-04-10	5	-24/+43
\| \| \| \| \|
\| * \| \| \|	Merge branch '22714-update-all-instances-of-fa-refresh' into 'master'	Alfredo Sumaran	2017-04-12	6	-8/+8
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update all instances of "fa-refresh" to "fa-spinner" Closes #22714 See merge request !10490
\| \| * \| \| \|	Update all instances of "fa-refresh" to "fa-spinner"	Andrew Torres	2017-04-11	6	-8/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '30858-system-notes-indent' into 'master'	Jacob Schatz	2017-04-12	1	-4/+12
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Indent system notes on desktop screens Closes #30858 See merge request !10667
\| \| * \| \| \| \|	Indent system notes on desktop screens	Annabel Dunstone Gray	2017-04-12	1	-4/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'change-merged-icon' into 'master'	Jacob Schatz	2017-04-12	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update merged icon See merge request !10635
\| \| * \| \| \| \| \|	Update merged iconchange-merged-icon	Annabel Dunstone Gray	2017-04-11	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix-preloading-merge_request_diff' into 'master'	Stan Hu	2017-04-12	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use preload to avoid Rails using JOIN See merge request !10666
\| \| * \| \| \| \| \| \|	Use preload to avoid Rails using JOIN	Lin Jen-Shin	2017-04-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/26786/
\| * \| \| \| \| \| \| \|	Reset New branch button when issue state changes	💃 Winnie 💃	2017-04-12	1	-51/+57
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Improve webpack-dev-server compatibility with non-localhost setups.	Mike Greiling	2017-04-12	3	-5/+36
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '2120-issues-search-bar-not-picking-up' into 'master'	Annabel Dunstone Gray	2017-04-12	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix filtered search input width for IE Closes #30856 See merge request !10662
\| \| * \| \| \| \| \|	Fix filtered search input width for IE	Clement Ho	2017-04-12	1	-1/+1
\| \| \|/ / / / /
\| * \| \| \| \| \|	Merge branch 'fix-missing-capitalisation-buttons' into 'master'	Clement Ho	2017-04-12	1	-4/+4
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed missing capitalisation on buttons See merge request !10631
\| \| * \| \| \| \|	Fixed missing help ui view capitalisation buttonsfix-missing-capitalisation-buttons	Jose Ivan Vargas	2017-04-11	1	-4/+4
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'fix_spaces_in_label_title' into 'master'	Sean McGivern	2017-04-12	1	-0/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove heading and trailing spaces from label's color and title See merge request !10603
\| \| * \| \| \| \|	Remove heading and trailing spaces from label's color and title	blackst0ne	2017-04-12	1	-0/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'user-activity-scroll-bar' into 'master'	Annabel Dunstone Gray	2017-04-12	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set user contribution calendar `overflow-x: scroll` more precisely Closes #30738 See merge request !10636
\| \| * \| \| \| \| \|	Let browser set overflow-x scroll on user activity calendar.user-activity-scroll-bar	Bryce Johnson	2017-04-11	1	-1/+1
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'zj-fix-coverage-bug' into 'master'	Kamil Trzciński	2017-04-12	1	-2/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return nil as coverage instead of a File object See merge request !10633
\| \| * \| \| \| \| \|	Return nil as coverage instead of a File objectzj-fix-coverage-bug	Z.J. van de Weg	2017-04-12	1	-2/+1
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given a valid pipeline job, and a regex which wouldn't match to a jobs trace, the stream of the trace would return the File object. This was not the case when it matched a value, as that would have been return from the block. Now the `extract_coverage` method returns `nil` if no match was found.
\| * \| \| \| \| \|	Merge branch 'zj-api-fix-build-events' into 'master'	Rémy Coutable	2017-04-12	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Api fix build events rename to Job events Closes #30412 See merge request !10586
\| \| * \| \| \| \| \|	Fix API not accepting job_events for webhookszj-api-fix-build-events	Z.J. van de Weg	2017-04-12	1	-2/+2
\| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When renaming, the argument on the projects hook API was forgotten. Now one could successfully set it again. The fix is a little ugly stylewise, but needed as the underlying model still refers to it as build_events. This commit is to fix it, later we should migrate the data to a new column. The edit on the spec file makes sure it passes now, and will fail when we migrate the column.
\| * \| \| \| \| \|	Merge branch 'siemens/gitlab-ce-fix/subgroup-hide-button' into 'master'	Rémy Coutable	2017-04-12	2	-1/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide new subgroup button if user has no permission to create one Closes #30139 See merge request !10627
\| \| * \| \| \| \| \|	Move permission to create subgroup into GroupPolicy	Dmitriy Zaporozhets	2017-04-11	3	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	fix(subgroups): add verification of group creation capability to subgroup UI	Fabio Huser	2017-03-30	2	-1/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'gitaly-testing' into 'master'	Rémy Coutable	2017-04-12	2	-15/+16
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Setup and run a Gitaly server for testing if GitalyClient is enabled See merge request !10298
\| \| * \| \| \| \| \| \|	Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testing	Alejandro Rodríguez	2017-04-11	2	-15/+16
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch '30457-expire-note-destroy' into 'master'	Sean McGivern	2017-04-12	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue's note cache expiration after delete Closes #30457 See merge request !10461
\| \| * \| \| \| \| \| \|	Fix issue's note cache expiration after delete	mhasbini	2017-04-11	1	-0/+1
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'dm-outdated-diff-link' into 'master'	Sean McGivern	2017-04-11	19	-79/+129
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572
\| \| * \| \| \| \| \|	Statisfy Robertcop and Seancopdm-outdated-diff-link	Douwe Maan	2017-04-11	2	-10/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add specs	Douwe Maan	2017-04-10	1	-0/+12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix specs	Douwe Maan	2017-04-09	3	-5/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Some code tweaks	Douwe Maan	2017-04-08	7	-17/+20
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix views after rebase	Douwe Maan	2017-04-08	2	-3/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix find_by_diff_refs	Douwe Maan	2017-04-08	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix specs and make tweaks	Douwe Maan	2017-04-08	6	-37/+48
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Change discussion headline to 'a now outdated portion of the diff'	Douwe Maan	2017-04-08	1	-4/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add link to diff header too	Douwe Maan	2017-04-08	2	-14/+16
\| \| \| \| \| \| \| \|