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

	Commit message (Collapse)	Author	Age	Files	Lines
*	[ci skip] Establish basic structure for ux_guide README.mdux-guide-restructure	awhildy	2016-11-10	60	-1/+676
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Block out pages needed for ux_guide Add resources stub to ux_guide home Fill out principles and basics Add TOC to basics Move all of UI guide to new UX guide structure Add first level structure on ux-guide pages Add more details to buttons Add button images. Update link on development Renamed surfaces to templates. Add tooltip details Update typography and icons on Basics page Add images for color. First draft of voice and tone Delete findings page Refine pages. Fill out Surfaces pages Clean up layout on basics, surfaces, features. Add anchorlinks and counts to components Fill out components page Add item title and system info block Fill out Features page Switch tooltip placement image
*	Merge branch '24369-remove-additional-padding' into 'master'	Annabel Dunstone Gray	2016-11-10	2	-0/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove additional padding on right-aligned items in MR widget. ## What does this MR do? Remove additional padding on right-aligned items in MR widget. So links look aligned. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Because the links are not aligned. ## Screenshots (if relevant) ![Screen_Shot_2016-11-10_at_22.38.26](/uploads/a1deacb77483125df3c25c320f53b579/Screen_Shot_2016-11-10_at_22.38.26.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24369 See merge request !7411
\| *	Remove additional padding on right-aligned items in MR widget.	Didem Acet	2016-11-10	2	-0/+5
\| \| \| \| \| \| \| \|	Fixes #24369.
* \|	Merge branch ↵	Annabel Dunstone Gray	2016-11-10	2	-14/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'24279-issue-merge-request-sidebar-todo-button-style-improvement' into 'master' Removed gray button styling from todo buttons in sidebars ## What does this MR do? Removes gray button styling from todo buttons in sidebars ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? gray buttons are inconsistent and look disabled ## Screenshots (if relevant) before: ![image](/uploads/98644ce1df8c903a2409fa066bca8195/image.png) after: ![image](/uploads/a2eb8a9c40c4e5cc081553647bde8235/image.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24279 See merge request !7387
\| * \|	removed gray button styling from todo buttons in sidebars24279-issue-merge-request-sidebar-todo-button-style-improvement	Dimitrie Hoekstra	2016-11-10	2	-14/+4
\| \| \|
* \| \|	Merge branch '24353-skipped-icon' into 'master'	Fatih Acet	2016-11-10	2	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resize skipped icon Resizes `skipped` icon to match all other status icons ![Screen_Shot_2016-11-10_at_7.35.07_AM](/uploads/5be0dc0638f12a3c984af747a03ce1e1/Screen_Shot_2016-11-10_at_7.35.07_AM.png) Closes #24353 See merge request !7401
\| * \| \|	Fix alignment of status icons in commit message list24353-skipped-icon	Annabel Dunstone Gray	2016-11-10	1	-0/+2
\| \| \| \|
\| * \| \|	Resize skipped icon	Annabel Dunstone Gray	2016-11-10	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch '24038-fix-no-register-pane-if-ldap' into 'master'	Sean McGivern	2016-11-10	2	-0/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix no "Register" tab if ldap auth is enabled (#24038) Closes #24038 See merge request !7274
\| * \| \| \|	Fix no "Register" tab if ldap auth is enabled (#24038)	Luc Didry	2016-11-10	2	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit is dedicated to GuilhemB, thanks for supporting me on Tipeee :-)
* \| \| \| \|	Merge branch '24048-dropdown-issue-with-devider' into 'master'	Fatih Acet	2016-11-10	2	-1/+5
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolves divider issue in group setting dropdown ## What does this MR do? This MR resolves the issue #24048 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? This MR removes extra divider from group setting dropdown when there is only one entry to show. This improves UX ## Screenshots (if relevant) Before ![dd-before](/uploads/b4696b610a921a710c6be74fbb212260/dd-before.png) After ![Screen_Shot_2016-11-10_at_4.09.36_PM](/uploads/a4ff6efe92ce60837afad079398c3880/Screen_Shot_2016-11-10_at_4.09.36_PM.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24048 See merge request !7398
\| * \| \| \|	adds changelog entry file for this MR24048-dropdown-issue-with-devider	Nur Rony	2016-11-10	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	resolves divider issue in group setting dropdown	Nur Rony	2016-11-10	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'hide-graph-btn' into 'master'	Fatih Acet	2016-11-10	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make toggle pipeline btn into button element Toggle pipeline graph button was a `div` instead of a `button` :frowning2: See merge request !7404
\| * \| \| \|	Make toggle pipeline btn into button element	Annabel Dunstone Gray	2016-11-10	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch 'grapify-token-api' into 'master'	Rémy Coutable	2016-11-10	2	-47/+31
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify triggers API ## What are the relevant issue numbers? Related to #22928 See merge request !7378
\| * \| \| \|	Grapify token API	Robert Schilling	2016-11-10	2	-47/+31
\| \|/ / /
* \| \| \|	Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into ↵	Douwe Maan	2016-11-10	4	-7/+62
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix error when using invalid branch name when creating a new pipeline ## What does this MR do? This MR fixes `500` error when creating a new pipeline though user interface ("Run pipeline") ## Are there points in the code the reviewer needs to double check? Is this a good approach to catch those exceptions on `Repository` level? ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #23982 See merge request !7324
\| * \| \| \|	Remove redundant rescue from repository keep_aroundfix/error-when-invalid-branch-for-new-pipeline-used	Grzegorz Bizon	2016-11-09	1	-5/+1
\| \| \| \| \|
\| * \| \| \|	Remove redundant space from repository model code	Grzegorz Bizon	2016-11-09	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add Changelog entry for new pipeline fix	Grzegorz Bizon	2016-11-07	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Evade some exceptions when using invalid references	Grzegorz Bizon	2016-11-07	2	-1/+54
\| \| \| \| \|
\| * \| \| \|	Improve code readability in pipelines controller	Grzegorz Bizon	2016-11-07	1	-1/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-cache-for-commit-status' into 'master'	Rémy Coutable	2016-11-10	2	-1/+5
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cache for commit status in commits list to respect branches Fix cache for commit status in commits list to respect branches Closes #24324 See merge request !7372
\| * \| \| \|	Fix cache for commit status in commits list to respect branches	Lin Jen-Shin	2016-11-10	2	-1/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'forking-in-progress-title' into 'master'	Sean McGivern	2016-11-10	2	-1/+5
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use 'Forking in progress' title when appropriate See merge request !7394
\| * \| \| \|	Use 'Forking in progress' title when appropriate	Philip Karpiak	2016-11-09	2	-1/+5
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch '23945-improve-ee_compat_check-task-part-3' into 'master'	Robert Speicher	2016-11-10	3	-83/+110
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improve ee_compat_check task (part 3)" Improve the `ee_compat_check` task with caching and keep artifacts on failure. Closes #23945. See merge request !7177
\| * \| \| \|	Improve EeCompatCheck, cache EE repo and keep artifacts for the ↵23945-improve-ee_compat_check-task-part-3	Rémy Coutable	2016-11-10	3	-83/+110
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ee_compat_check task Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch '23502-import-university-training-preso-slides' into 'master'	Achilleas Pipinellis	2016-11-10	27	-0/+1383
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import University training preso slides ## What does this MR do? Adds missing training material from University. ## What are the relevant issue numbers? Closes #23502 See merge request !7016
\| * \| \| \|	Added training material23502-import-university-training-preso-slides	Sean Packham	2016-10-20	27	-0/+1383
\| \| \| \| \|
* \| \| \| \|	Merge branch 'grapify-milestone-api' into 'master'	Rémy Coutable	2016-11-10	2	-54/+66
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify milestones API ## What are the relevant issue numbers? Related to #22928 See merge request !7373
\| * \| \| \|	Grapify milestones APIgrapify-milestone-api	Robert Schilling	2016-11-10	2	-54/+66
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'grapify-runners-api' into 'master'	Rémy Coutable	2016-11-10	2	-55/+66
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify runners API ## What are the relevant issue numbers? Related to #22928 See merge request !7377
\| * \| \| \|	Grapify runners API	Robert Schilling	2016-11-10	2	-55/+66
\| \|/ / /
* \| \| \|	Merge branch 'grapify-session-api' into 'master'	Rémy Coutable	2016-11-10	2	-17/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the session API ## What are the relevant issue numbers? Related to #22928 See merge request !7381
\| * \| \| \|	Grapify the session APIgrapify-session-api	Robert Schilling	2016-11-09	2	-17/+18
\| \|/ / /
* \| \| \|	Merge branch 'feature/api_owned_resource' into 'master'	Sean McGivern	2016-11-10	5	-0/+65
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Add api endpoint `/groups/owned` See merge request !7103
\| * \| \|	Added API endpoint groups/owned	Borja Aparicio	2016-11-08	4	-0/+41
\| \| \| \|
\| * \| \|	Added API spec test for projects/owned endpoint	Borja Aparicio	2016-11-08	1	-0/+24
\| \| \| \|
* \| \| \|	Fix CHANGELOG after 8.14.0-rc1 tag	Alejandro Rodríguez	2016-11-09	1	-3/+0
\| \| \| \|
* \| \| \|	Update CHANGELOG.md for 8.14.0-rc1	Alejandro Rodríguez	2016-11-09	32	-126/+34
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Fix YAML syntax on CHANGELOG entry	Alejandro Rodríguez	2016-11-09	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch '24341-fix-failure' into 'master'	Stan Hu	2016-11-09	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove order-dependent expectation Fixes #24341, hopefully See merge request !7385
\| * \| \| \|	Remove order-dependent expectation24341-fix-failure	Rémy Coutable	2016-11-09	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'rs-doc-highlighting' into 'master'	Achilleas Pipinellis	2016-11-09	3	-15/+15
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more highlighting to development docs Now that docs.gitlab.com has lovely highlighting, we should make sure we use it everywhere it makes sense! See merge request !7369
\| * \| \| \|	Add more highlighting to Shell Commands docrs-doc-highlighting	Robert Speicher	2016-11-09	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Add more highlighting to Instrumentation doc	Robert Speicher	2016-11-09	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Add more highlighting to Migration Style Guide doc	Robert Speicher	2016-11-09	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch '23731-add-param-to-user-api' into 'master'	Sean McGivern	2016-11-09	4	-1/+45
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add query param to filter users by 'external' & 'blocked' type on API Closes #23731 See merge request !7109