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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add filter focus for filtered search visual tokensadd-filter-focus-style	Clement Ho	2017-03-16	3	-4/+49
\|
*	Merge branch 'convert-data-attr-search-bar' into 'master'	Alfredo Sumaran	2017-03-09	1	-17/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Convert data attributes in search_bar.html.haml Closes #29082 See merge request !9819
\| *	Convert data attributes in search_bar.html.haml	Clement Ho	2017-03-09	1	-17/+17
\| \|
* \|	Merge branch '28874-fix-milestone-issues-position-order-in-api' into 'master'	Rémy Coutable	2017-03-09	5	-6/+40
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Order milestone issues by position ascending in api Closes #28847 See merge request !9635
\| *	Order milestone issues by position ascending in api	George Andrinopoulos	2017-03-09	5	-6/+40
\|/
*	Merge branch '29048-user-wrap-firefox' into 'master'	Clement Ho	2017-03-09	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove inline-block styling from dropdown avatars Closes #29048 See merge request !9840
\| *	Remove inline-block styling from dropdown avatars29048-user-wrap-firefox	Annabel Dunstone Gray	2017-03-09	1	-2/+2
\| \|
* \|	Merge branch '29014-create-issue-form-buttons-misaligned-on-mobile' into ↵	Filipa Lacerda	2017-03-09	2	-13/+18
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' [#29014] Create issue form buttons are misaligned on mobile Closes #29014 See merge request !9706
\| * \|	[#29014] Create issue form buttons are misaligned on mobile	TM Lee	2017-03-09	2	-13/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Ensure Save/Create button is aligned with Cancel - Move the cancel button above but float to the right using pull-right - Allows responsive css to flow
* \| \|	Merge branch 'diff-avatar-improvements' into 'master'	Filipa Lacerda	2017-03-09	3	-4/+54
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Diff avatar improvements Closes #29237, #29238, and #29243 See merge request !9829
\| * \| \|	Added regression testsdiff-avatar-improvements	Phil Hughes	2017-03-09	1	-0/+50
\| \| \| \|
\| * \| \|	Check was in wrong part, the avatar container class should always be added ↵	Phil Hughes	2017-03-09	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on lines in the changes tab
\| * \| \|	Fixed bugs with diff comment avatars	Phil Hughes	2017-03-09	2	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The comment button on commit view was way out to the left side because the element that renders the diff avatars was rendering when it shouldnt be When commenting on a discussion on the discussions tab it would try to render the avatar & in some cases work correctly even though it shouldnt be possible for this to happen. Changed the if statement to take this into account Closes #29237, #29238, #29243
* \| \| \|	Merge branch 'update-native-unicode-emojis-with-harmony-modules' into 'master'	Filipa Lacerda	2017-03-09	11	-366/+375
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update emojis to use harmony modules (import/export) See merge request !9784
\| * \| \| \|	Update emojis to use harmony modules (import/export)update-native-unicode-emojis-with-harmony-modules	Eric Eastwood	2017-03-08	11	-366/+375
\| \| \| \| \|
* \| \| \| \|	Merge branch '28030-infinite-offset' into 'master'	Filipa Lacerda	2017-03-09	4	-2/+107
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	respect offset and limit query params for infinite lists Closes #28030 See merge request !9540
\| * \| \| \| \|	respect offset and limit query params for infinite lists28030-infinite-offset	Simon Knox	2017-03-09	4	-2/+107
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rc-document-approvals-in-engineering-workflow' into 'master'	Sean McGivern	2017-03-09	1	-4/+30
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document "How to get your MR reviewed, approved, and merged" See merge request !9839
\| * \| \| \| \| \|	Document "How to get your MR reviewed, approved, and merged"	Rémy Coutable	2017-03-09	1	-4/+30
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'protobuf-from-source' into 'master'	Sean McGivern	2017-03-09	2	-0/+32
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instructions for installing google-protobuf from source See merge request !9665
\| * \| \| \| \| \|	Instructions for installing google-protobuf from source	Jacob Vosmaer	2017-03-09	2	-0/+32
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'docs/ci-variables-deprecation-table' into 'master'	Achilleas Pipinellis	2017-03-09	2	-100/+97
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup CI variables table and add a deprecation note See merge request !9831
\| * \| \| \| \| \|	Move example variables output to bottomdocs/ci-variables-deprecation-table	Achilleas Pipinellis	2017-03-09	1	-36/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \|	Cleanup CI variables table and add a deprecation note	Achilleas Pipinellis	2017-03-09	2	-65/+62
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'update-ace' into 'master'	Rémy Coutable	2017-03-09	2	-1/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update ACE to 1.2.6 Closes #26640 See merge request !9835
\| * \| \| \| \|	Update ACE to 1.2.6update-ace	Sean McGivern	2017-03-09	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes input problems with compose key in Chrome 53+ - has been reported for Chinese and Hangul at least.
* \| \| \| \| \|	Merge branch 'dz-nested-groups-members' into 'master'	Dmitriy Zaporozhets	2017-03-09	6	-44/+69
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show members of parent groups on project members page Closes #28786 and #27962 See merge request !9764
\| * \| \| \| \| \|	Fix group members method for project import/export	Dmitriy Zaporozhets	2017-03-09	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Show members of parent groups on project members pagedz-nested-groups-members	Dmitriy Zaporozhets	2017-03-09	5	-43/+62
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'patch-15' into 'master'	Rémy Coutable	2017-03-09	1	-3/+3
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make clear that commits trigger CI jobs in quick start guide See merge request !9805
\| * \| \| \| \|	Update README.md	Alex Karnovsky	2017-03-08	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I replaced "merge requests" by "commits". As far as I notice, merge requests per se don't trigger CI; commits and pushes (which are essentially adding commits) do. This is logical: an MR doesn't create anything new, so there is nothing to test.
* \| \| \| \| \|	Merge branch 'storage-validation-improvement' into 'master'	Sean McGivern	2017-03-09	2	-45/+63
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve storage validation after configuration structure update See merge request !9811
\| * \| \| \| \| \|	Improve storage validation after configuration structure updatestorage-validation-improvement	Alejandro Rodríguez	2017-03-08	2	-45/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Besides improving the error message to specify what exactly you need to do to solve the error, we now don't skip all storage validations on the test environment, so that you also get a nice error message if you're running tests. Now if conditions are met to skip valitaions (test env or env variable) we still make sure the settings _look_ sane, we just skip verifying the paths exists and meet the given conditions.
* \| \| \| \| \| \|	Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master'	Kamil Trzciński	2017-03-09	7	-4/+102
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Verbosify blocked pipeline status description Closes #29134 See merge request !9800
\| * \| \| \| \| \|	Add specs for an extended blocked pipeline statusfeature/gb/verbosify-blocked-pipeline-status	Grzegorz Bizon	2017-03-08	2	-0/+50
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Adjust specs for core pipeline detailed statuses	Grzegorz Bizon	2017-03-08	2	-3/+25
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Verbosify blocked pipeline status description	Grzegorz Bizon	2017-03-08	3	-1/+27
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'change-activity-view-wording' into 'master'	Dmitriy Zaporozhets	2017-03-09	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change activity view wording See merge request !9777
\| * \| \| \| \| \| \|	Change activity view wordingchange-activity-view-wording	Annabel Dunstone Gray	2017-03-07	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'move-u2f-bundle' into 'master'	Alfredo Sumaran	2017-03-09	4	-4/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move u2f javascript library to webpack config See merge request !9755
\| * \| \| \| \| \| \| \|	move u2f library to webpackmove-u2f-bundle	Mike Greiling	2017-03-07	4	-4/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '28402-fix-starred-projects-filter-wrong-message-on-no-results' ↵	Rémy Coutable	2017-03-09	3	-10/+33
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix wrong message on starred projects filtering Closes #28402 See merge request !9488
\| * \| \| \| \| \| \| \|	Fix wrong message on starred projects filtering	George Andrinopoulos	2017-03-09	3	-10/+33
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'update-templates-9-0' into 'master'	Robert Speicher	2017-03-09	29	-51/+299
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the gitignore and gitlab-ci templates for 9.0 See merge request !9824
\| * \| \| \| \| \| \| \|	Update the gitignore and gitlab-ci templates for 9.0	DJ Mountney	2017-03-08	29	-51/+299
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'remove-awards-handler-spec-timeout' into 'master'	Clement Ho	2017-03-09	1	-3/+0
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove timeout from awards_handler_spec.js See merge request !9822
\| * \| \| \| \| \| \| \|	Remove timeout from awards_handler_spec.jsremove-awards-handler-spec-timeout	💃 Winnie 💃	2017-03-08	1	-3/+0
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'patch-13' into 'master'	Rémy Coutable	2017-03-08	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	specify where to finish database HA setup See merge request !9731
\| * \| \| \| \| \| \| \|	specify where to finish database HA setup	Ben Bodenmiller	2017-03-06	1	-1/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'patch-15' into 'master'	Rémy Coutable	2017-03-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed typo with project service documentation link See merge request !9708