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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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 '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
\| * \| \| \| \|	Fixed typo with project service documentation link	Miguel	2017-03-05	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '29034-fix-github-importer' into 'master'	Douwe Maan	2017-03-08	3	-1/+41
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix name colision when importing GitHub pull requests from forked repositories Closes #29034 See merge request !9719
\| * \| \| \| \| \|	Refactor some code29034-fix-github-importer	Gabriel Mazetto	2017-03-08	2	-2/+24
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Changelog	Gabriel Mazetto	2017-03-08	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix name colision when importing GitHub pull requests from forked repositories	Gabriel Mazetto	2017-03-08	2	-1/+15
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '29162-refactor-dropdown-milestone-spec' into 'master'	Rémy Coutable	2017-03-08	2	-27/+35
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dropdown_milestone_spec.rb Closes #29162 See merge request !9814
\| * \| \| \| \| \| \|	Refactor dropdown_milestone_spec.rb	George Andrinopoulos	2017-03-08	2	-27/+35
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'es6-class-issue' into 'master'	Clement Ho	2017-03-08	4	-140/+135
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert Issue into ES6 class See merge request !9636
\| * \| \| \| \| \| \| \|	Convert Issue into ES6 class (!9636)	winniehell	2017-03-08	4	-140/+135
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch '29165-subscribe-btn' into 'master'	Alfredo Sumaran	2017-03-08	2	-4/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove hidden text from subscribe button Closes #29165 See merge request !9790
\| * \| \| \| \| \| \| \|	Remove hidden text from subscribe button	Annabel Dunstone Gray	2017-03-08	2	-4/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'rs-lower-capybara-timeout' into 'master'	Rémy Coutable	2017-03-08	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decrease Capybara timeout for CI environment Closes #29091 See merge request !9816
\| * \| \| \| \| \| \| \|	Decrease Capybara timeout for CI environmentrs-lower-capybara-timeout	Robert Speicher	2017-03-08	2	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'patch-14' into 'master'	Rémy Coutable	2017-03-08	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spell out what VIP is See merge request !9733
\| * \| \| \| \| \| \| \|	spell out what VIP is	Ben Bodenmiller	2017-03-06	1	-3/+3
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-scrolling-settings-tab' into 'master'	Filipa Lacerda	2017-03-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra space for settings dropdown See merge request !9788
\| * \| \| \| \| \| \| \|	Remove extra space for settings dropdownfix-scrolling-settings-tab	Annabel Dunstone Gray	2017-03-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '23220-fail-add-repo-explicitly' into 'master'	Robert Speicher	2017-03-08	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise an exception if creating a test repository fails See merge request !9815
\| * \| \| \| \| \| \| \|	Raise an exception if creating a test repository fails	Nick Thomas	2017-03-08	1	-2/+2
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '29192-fix-emoji-node-modules-reference-for-unicode-versions' ↵	Douwe Maan	2017-03-08	3	-2/+2382
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix reference to node_modules for emoji unicode versions Closes #29192 See merge request !9810
\| * \| \| \| \| \| \| \|	Fix reference to node_modules in built package	Eric Eastwood	2017-03-08	3	-2/+2382
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29192 See https://gitlab.slack.com/archives/frontend/p1488973548024005
* \| \| \| \| \| \| \| \|	Merge branch 'patch-15' into 'master'	Rémy Coutable	2017-03-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update container_registry.md: fix private-docker link See merge request !9686
\| * \| \| \| \| \| \| \|	Update container_registry.md: fix private-docker link	NeroBurner	2017-03-03	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '26202-change-dropdown-style-slightly' into 'master'	Annabel Dunstone Gray	2017-03-08	2	-10/+18
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed dropdown style slightly Closes #26202 See merge request !9747
\| * \| \| \| \| \| \| \|	Changed dropdown style slightly26202-change-dropdown-style-slightly	dimitrieh	2017-03-08	2	-10/+18
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-visual-tokens' into 'master'	Alfredo Sumaran	2017-03-08	5	-25/+81
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent visual token dropdown from opening the wrong filter dropdown See merge request !9789
\| * \| \| \| \| \| \| \| \|	Prevent visual token dropdown from opening the wrong filter dropdownfix-visual-tokens	Clement Ho	2017-03-08	5	-25/+81
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '29185-environments-folder-links' into 'master'	Annabel Dunstone Gray	2017-03-08	3	-5/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Style action buttons in show environments view to match index view Closes #29185 See merge request !9804
\| * \| \| \| \| \| \| \| \| \|	Apply same html and css to the action buttons in environment show view table ↵29185-environments-folder-links	Filipa Lacerda	2017-03-08	3	-5/+4
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as the ones in index table
* \| \| \| \| \| \| \| \| \|	Merge branch 'diff-comments-avatars' into 'master'	Jacob Schatz	2017-03-08	18	-52/+566
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added discussion comments avatars to diff Closes #17237 See merge request !7357
\| * \| \| \| \| \| \| \| \|	Added discussion comments avatars to diff	Phil Hughes	2017-03-08	18	-52/+566
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'update_GITLAB_SHELL_VERSION' into 'master'	Sean McGivern	2017-03-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GITLAB_SHELL_VERSION to 5.0.0 See merge request !9809
\| * \| \| \| \| \| \| \| \|	Update GITLAB_SHELL_VERSION to 5.0.0	Pawel Chojnacki	2017-03-08	1	-1/+1
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related to gitlab-ee#1648
* \| \| \| \| \| \| \| \|	Merge branch 'dm-remove-double-project-nav-bar' into 'master'	Robert Speicher	2017-03-08	2	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't show double nav bar on project page when activity is the default project view Closes #29096 See merge request !9798