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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Increase code coverage for admin/cohorts pagedz-add-cohort-spec	Dmitriy Zaporozhets	2017-04-27	1	-0/+15
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'add-username-to-activity-feed' into 'master'	Rémy Coutable	2017-04-27	3	-1/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add username to activity atom feed Closes #31268 See merge request !10802
\| *	Add username to activity atom feed (!10802)	winniehell	2017-04-26	3	-1/+6
\| \|
* \|	Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'	Sean McGivern	2017-04-27	8	-7/+66
\|\ \
\| * \|	Fix rendering emoji inside a string	blackst0ne	2017-04-25	8	-7/+66
\| \| \|
* \| \|	Merge branch 'lleoni-fix-notify-post-receive'	Rémy Coutable	2017-04-27	2	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	See pull request https://github.com/gitlabhq/gitlabhq/pull/10429
\| * \| \|	Wrong method call on notify_post_receive.	Luigi Leoni	2017-04-27	2	-1/+5
\| \| \| \|
* \| \| \|	Merge branch '30645-show-pipeline-events-description' into 'master'	Kamil Trzciński	2017-04-27	2	-2/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove description for build_events, add pipeline_events Closes #30645 See merge request !10908
\| * \| \| \|	Remove description for build_events, add pipeline_events30645-show-pipeline-events-description	Lin Jen-Shin	2017-04-25	2	-2/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Phil Hughes	2017-04-27	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'31475-issue-boards-sidebar-milestone-dropdown-title-has-a-typo' into 'master' Fix typo found in issue board sidebar milestone dropdown Closes #31475 See merge request !10950
\| * \| \| \| \|	Fix typo found in issue board sidebar milestone dropdown31475-issue-boards-sidebar-milestone-dropdown-title-has-a-typo	Clement Ho	2017-04-26	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'patch-16' into 'master'	Achilleas Pipinellis	2017-04-27	1	-5/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update troubleshooting section Closes #13479 See merge request !10618
\| * \| \| \| \|	Update bamboo.md, the troubleshooting section	Islam Wazery	2017-04-26	1	-5/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-18' into 'master'	Achilleas Pipinellis	2017-04-27	1	-10/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don't require no_root_squash on NFS, only recommend See merge request !10197
\| * \| \| \| \| \|	don't require no_root_squash on NFS only recommend	Ben Bodenmiller	2017-04-13	1	-10/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-21' into 'master'	Achilleas Pipinellis	2017-04-27	1	-1/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clarify when GitLab pages requires special config for load balancer See merge request !10954
\| * \| \| \| \| \|	special pages config only needed for custom domain support	Ben Bodenmiller	2017-04-27	1	-1/+2
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'backport-cyclomatic_complexity-fix' into 'master'	Douwe Maan	2017-04-26	1	-18/+26
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Rubocop CyclomaticComplexity offense See merge request !10941
\| * \| \| \| \| \|	Fix Rubocop CyclomaticComplexity offensebackport-cyclomatic_complexity-fix	Rémy Coutable	2017-04-26	1	-18/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '30466-click-x-to-remove-filter' into 'master'	Jacob Schatz	2017-04-26	8	-21/+145
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add button to delete filters from filtered search bar Closes #30466 See merge request !10795
\| * \| \| \| \| \| \|	Add button to delete filters from filtered search bar	Clement Ho	2017-04-26	8	-21/+145
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '31458-fix-rubocop-failure' into 'master'	Rémy Coutable	2017-04-26	1	-17/+21
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a failing Rubocop rule on master Closes #31458 See merge request !10947
\| * \| \| \| \| \| \|	Fix a failing Rubocop rule on master	Douglas Barbosa Alexandre	2017-04-26	1	-17/+21
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gl-version-backup-file' into 'master'	Rémy Coutable	2017-04-26	4	-116/+146
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add GitLab version to backup file name See merge request !10901
\| * \| \| \| \| \| \| \|	Fix failing specgl-version-backup-file	Achilleas Pipinellis	2017-04-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	http://rubular.com/r/op7TI9UX6K
\| * \| \| \| \| \| \| \|	Refactor backup/restore docs	Achilleas Pipinellis	2017-04-25	2	-114/+144
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Expose GitLab version in backup file	Achilleas Pipinellis	2017-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of doing hacks like http://stackoverflow.com/a/26082612/974710
* \| \| \| \| \| \| \| \|	Merge branch 'dm-sidekiq-5' into 'master'	Stan Hu	2017-04-26	3	-5/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Sidekiq to 5.0.0 See merge request !10943
\| * \| \| \| \| \| \| \| \|	Bump Sidekiq to 5.0.0dm-sidekiq-5	Douwe Maan	2017-04-26	3	-5/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'opt-out-not-in' into 'master'	Sean McGivern	2017-04-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	correct documentation on opt-out-ness of usage ping See merge request !10945
\| * \| \| \| \| \| \| \| \|	correct documentation on opt-out-ness of usage pingopt-out-not-in	Job van der Voort	2017-04-26	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '31335-job-dropdown' into 'master'	Phil Hughes	2017-04-26	5	-64/+114
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Jobs dropdown in mini graph should close when we receive an error" Closes #31335 See merge request !10887
\| * \| \| \| \| \| \| \| \|	Resolve "Jobs dropdown in mini graph should close when we receive an error"	Filipa Lacerda	2017-04-26	5	-64/+114
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'zj-dockerfiles' into 'master'	Douwe Maan	2017-04-26	10	-4/+70
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Submodule Dockerfile templates See merge request !10663
\| * \| \| \| \| \| \| \| \|	Submodule Dockerfile templates	Zeger-Jan van de Weg	2017-04-26	10	-4/+70
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'replace_header_mr_icon' into 'master'	Filipa Lacerda	2017-04-26	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace header merge request icon Closes #31088 See merge request !10932
\| * \| \| \| \| \| \| \|	Replace header merge request icon	blackst0ne	2017-04-26	2	-1/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'zj-rspec-set' into 'master'	Rémy Coutable	2017-04-26	6	-34/+58
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use rspec-set to speed up examples See merge request !10551
\| * \| \| \| \| \| \| \|	Use rspec-set to speed up examples	Zeger-Jan van de Weg	2017-04-26	6	-34/+58
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'backport-md-cache-fix' into 'master'	Dmitriy Zaporozhets	2017-04-26	2	-3/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Work around a hard-to-understand failure in `CacheMarkdownField` See merge request !10918
\| * \| \| \| \| \| \| \|	Fix a failing spec	Nick Thomas	2017-04-25	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Swap a before_save call with a before_create/before_update pair to avoid a ↵	Nick Thomas	2017-04-25	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	confict with elasticsearch-model
* \| \| \| \| \| \| \| \|	Merge branch '26509-show-update-time' into 'master'	Annabel Dunstone Gray	2017-04-26	5	-17/+26
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add updated time to project list Closes #26509 See merge request !8514
\| * \| \| \| \| \| \| \| \|	Add updated time to project list	Jeff Stubler	2017-04-21	5	-17/+26
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-reorg-landing-page' into 'master'	Achilleas Pipinellis	2017-04-26	3	-95/+214
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorg CE Docs landing page Closes #31069 See merge request !10754
\| * \| \| \| \| \| \| \| \| \|	Reorg CE Docs landing page	Marcia Ramos	2017-04-26	3	-95/+214
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Clement Ho	2017-04-26	5	-10/+39
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22826-ui-inconsistency-different-files-views-find-file-button-missing' into 'master' [#22826] Ensure find_file_link and download button is part of file tree header Closes #22826 See merge request !9847
\| * \| \| \| \| \| \| \| \| \|	[#22826] Add newline before expect in accordance to four phase thoughtbot style	TM Lee	2017-04-25	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	[#22826] Ensure find_file_link and download button is part of file tree header	TM Lee	2017-04-23	5	-10/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move the find_file_link and download partial into the project tree_header partial - Added Changelog
* \| \| \| \| \| \| \| \| \| \|	Merge branch '12910-personal-snippet-prep-2' into 'master'	Sean McGivern	2017-04-26	10	-29/+80
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support preview_markdown action for personal_snippets See merge request !10810