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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix typosfix/make-github-import-retryable	Ahmad Sherif	2016-10-28	2	-2/+2
\|
*	Abstract the use of imported[!?] and {current,increment}_page in GitHub importer	Ahmad Sherif	2016-10-28	1	-50/+34
\|
*	Use public_send instead of send	Ahmad Sherif	2016-10-28	1	-1/+1
\|
*	Modify GitHub importer to be retryable	Ahmad Sherif	2016-10-28	9	-27/+136
\|
*	Check if repository already exists before trying to re-import it	Ahmad Sherif	2016-10-28	2	-2/+2
\|
*	Merge branch 'fix/gh-import-bugs' into 'master'	Sean McGivern	2016-10-28	4	-13/+26
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix couple of GitHub importing bugs Fix a bug in GH comment importing and label applying for imported MRs. See merge request !7139
\| *	Fix importing MR comments from GitHubfix/gh-import-bugs	Ahmad Sherif	2016-10-27	2	-6/+8
\| \|
\| *	Fix applying labels for GitHub-imported MRs	Ahmad Sherif	2016-10-27	4	-7/+18
\| \|
* \|	Merge branch 'modal-mergerequest-shorten-clipboard' into 'master'	Annabel Dunstone Gray	2016-10-27	2	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	edited stylesheet with mr modal fixes and added to changelog ## What does this MR do? It shortens the modal command merge info elements. ## Are there points in the code the reviewer needs to double check? I used the `.dark` class.. is that correct usage? Made no issue as this is a minor upgrade to UI ## Why was this MR needed? Clipboard buttons could obscure information in the merge info modal, this way its clean. ## Screenshots (if relevant) From: ![image](/uploads/99269c9a314c593cb06239c27565b07c/image.png) To: ![image](/uploads/7e278a5aaa8c57270e8a320cc270b5d8/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] 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? None, its a quick fix See merge request !7145
\| * \|	edited stylesheet with mr modal fixes and added to changelogmodal-mergerequest-shorten-clipboard	Dimitrie Hoekstra	2016-10-27	2	-0/+5
\| \| \|
* \| \|	Merge branch 'link-to-contributing-from-readme' into 'master'	Sid Sijbrandij	2016-10-27	1	-0/+4
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add section about contributing to README Closes #23830 See merge request !7137
\| * \|	Add section about contributing to READMElink-to-contributing-from-readme	Adam Niedzielski	2016-10-27	1	-0/+4
\| \| \|
* \| \|	Merge branch 'remove-jquery-cookie-from-dashboard-spec' into 'master'	Jacob Schatz	2016-10-27	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaced jquery.cookie with js.cookie ## What does this MR do? Fixes currently failing `teaspoon` build by replacing the last reference to `jquery.cookie` with `js.cookie`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? `master` failing. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] 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? See merge request !7160
\| * \| \|	Replaced jquery.cookie with js.cookie	Luke Bennett	2016-10-27	1	-1/+1
\|/ / /
* \| \|	Merge branch 'fix-linting' into 'master'	Jacob Schatz	2016-10-27	7	-2/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable linting for ES6 files ## What does this MR do? Add `.js.es6` to file extensions checked by ESLint. ## What are the relevant issue numbers? Follows !5445 See merge request !7156
\| * \| \|	Enable linting for ES6 files	winniehell	2016-10-27	7	-2/+8
\| \| \| \|
* \| \| \|	Merge branch 'doc/improve-coverage-badge-docs' into 'master'	Achilleas Pipinellis	2016-10-27	9	-61/+159
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document CI pipelines settings See merge request !5847
\| * \| \| \|	Add more images for the test coverage docs	Achilleas Pipinellis	2016-10-27	4	-6/+18
\| \| \| \| \|
\| * \| \| \|	Use better wording for test coverage parsing help text	Achilleas Pipinellis	2016-10-27	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Rearrange the Pipelines settings page sections and link to docs	Achilleas Pipinellis	2016-10-27	1	-19/+34
\| \| \| \| \|
\| * \| \| \|	Fully document the pipelines settings page	Achilleas Pipinellis	2016-10-27	5	-40/+111
\| \| \| \| \|
\| * \| \| \|	Improve documentation for test coverage report badge	Grzegorz Bizon	2016-10-27	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'dz-revert-revert' into 'master'	Dmitriy Zaporozhets	2016-10-27	3	-16/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twitter"."" Looks like I accidently reverted https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7035 although I did not want to . This MR reverts my revert. See merge request !7127
\| * \| \| \| \|	Revert "Revert "Change "Group#web_url" to return "/groups/twitter" rather ↵dz-revert-revert	Dmitriy Zaporozhets	2016-10-27	3	-16/+25
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	than "/twitter"."" This reverts commit 9dbd5b3cfad10b214ae5ef27c39246bbb74a5077.
* \| \| \| \|	Merge branch 'patch-6' into 'master'	Rémy Coutable	2016-10-27	1	-0/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documents that users with two-factor authentication enabled may also need to create a personal access token to use git over HTTPS. To address a support issue (gitlab-com/support-forum#980) about why passwords don't work in git when two-factor auth is enabled. gitlab-com/support-forum#980 See merge request !6616
\| * \| \| \| \|	Add info about creating a personal access token	Lucas	2016-09-30	1	-0/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '23866-builds-dropdown' into 'master'	Fatih Acet	2016-10-27	2	-2/+5
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase z index on fixed mr tabs Before: <img src="/uploads/e890a4f185af87b66251d744fbe840d5/Screen_Shot_2016-10-26_at_11.58.45_AM.png" width="400px"> After: <img src="/uploads/0bbf72888f6a47bd3027ee7dfff542da/Screen_Shot_2016-10-26_at_11.58.28_AM.png" width="400px"> Closes #23866 See merge request !7124
\| * \| \| \| \|	Update changelog23866-builds-dropdown	Annabel Dunstone Gray	2016-10-26	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Increase z index on fixed mr tabs	Annabel Dunstone Gray	2016-10-26	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '21645-mail_room_sentinel'	Douwe Maan	2016-10-27	8	-8/+108
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Updated mail_room and added sentinel support to Reply by Email21645-mail_room_sentinel	Gabriel Mazetto	2016-10-26	8	-8/+108
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'add-todo-toggle-event' into 'master' remove-tooltip-text-truncation-from-pipeline-graph-build-node-tooltips	Fatih Acet	2016-10-27	15	-13/+223
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add todo toggle event ## What does this MR do? Adds a custom jQuery event `todo:toggle` to detect when a new todo is added so that the respective todo counters (header navigation and sidebar) can update as needed ## Are there points in the code the reviewer needs to double check? * I wasn't sure whether each `spec` should be modularized based on the html templates or whether they should be separated based on function. There are some crossovers between the `dashboard_spec` and the `header_spec`. * The naming conventions for `sidebar` and `right_sidebar` were a little confusing since they were named the opposite in their `specs`. I made a few assumptions and named a few files based on what I thought they should be named. I'd be happy to change it to something else though :smile: ## Why was this MR needed? This resolves an existing issue where the todo count on the sidebar would not update (until refresh) and refactors the existing methods that are used to update the todo counters (header navigation and sidebar) ## What are the relevant issue numbers? Closes #20140 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5724
\| * \| \| \| \| \|	Add todo toggle event	Clement Ho	2016-10-26	15	-13/+223
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '23868-build-graph-tooltips' into 'master'	Fatih Acet	2016-10-27	3	-7/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove tooltips from build nodes Before: <img src="/uploads/48441dccfe39c5eb1da3dbb9a26e6bd2/Screen_Shot_2016-10-26_at_2.43.46_PM.png" width="400px"> After: <img src="/uploads/d72b2ad4603c964283e155e5a2b053fe/Screen_Shot_2016-10-26_at_2.43.31_PM.png" width="400px"> Closes #23868 See merge request !7128
\| * \| \| \| \| \|	Remove tooltips from build nodes23868-build-graph-tooltips	Annabel Dunstone Gray	2016-10-26	3	-7/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue-boards-new-list-stop-closing' into 'master'	Fatih Acet	2016-10-27	3	-0/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create new list dropdown stays open after new list ## What does this MR do? After creating a new list, the dropdown stays open until the user closes the dropdown themselves. ## Screenshots (if relevant) ![keep-open](/uploads/06580dd552647b1a9e5fabc2c978148b/keep-open.gif) ## What are the relevant issue numbers? Closes #22852 See merge request !6742
\| * \| \| \| \| \| \|	Create new list dropdown stays open after new listissue-boards-new-list-stop-closing	Phil Hughes	2016-10-27	3	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #22852
* \| \| \| \| \| \| \|	Merge branch '5613-backups-fail' into 'master'	Douwe Maan	2016-10-27	3	-17/+150
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backups fail occasionally with "tar: ./objects: file changed as we read it" error - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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] Added for this feature/bug - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #5613 See merge request !5814
\| * \| \| \| \| \| \|	Backups do not fail anymore when using tar on annex and custom_hooks	tiagonbotelho	2016-10-27	3	-17/+150
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	only.
* \| \| \| \| \| \| \|	Merge branch '23258-invalid-encoding' into 'master'	Kamil Trzciński	2016-10-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix encoding issues on pipeline commits ## What does this MR do? #### What does this MR do? Sets `escape: false` on `truncate` method to fix commit message on pipelines page #### Screenshots (if relevant) Before: ![Screen_Shot_2016-10-12_at_8.53.10_AM](/uploads/5e26e98a272139fe2264c315d579178f/Screen_Shot_2016-10-12_at_8.53.10_AM.png) After: ![Screen_Shot_2016-10-12_at_8.52.49_AM](/uploads/58c6c69f2ba735fdcd5a0b6922b56aa7/Screen_Shot_2016-10-12_at_8.52.49_AM.png) #### What are the relevant issue numbers? Closes #23258 See merge request !6832
\| * \| \| \| \| \| \| \|	Fix encoding issues on pipeline commits23258-invalid-encoding	Annabel Dunstone Gray	2016-10-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'delete-branch-remove-tooltip' into 'master'	Alfredo Sumaran	2016-10-27	3	-25/+7
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed delete branch tooltip ## What does this MR do? Removed the tooltip on the delete branch button & add `aria-label` ## What are the relevant issue numbers? Closes #23253 See merge request !6954
\| * \| \| \| \| \| \| \|	Removed delete branch tooltip and testsdelete-branch-remove-tooltip	Phil Hughes	2016-10-26	3	-25/+7
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #23253
* \| \| \| \| \| \| \|	Merge branch 'docs/styleguide-headings' into 'master'	Achilleas Pipinellis	2016-10-27	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about ephemeral statuses in headings See merge request !7131
\| * \| \| \| \| \| \| \|	Add note about ephemeral statuses in headings	Achilleas Pipinellis	2016-10-27	1	-1/+3
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'enable-scss-lint-pseudo-element' into 'master'	Annabel Dunstone Gray	2016-10-26	12	-28/+28
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable PseudoElement in scss-lint ## What does this MR do? Enables `PseudoElement` in `.scss-lint.yml` ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Improve SCSS maintainability and consistency ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #23485 See merge request !7083
\| * \| \| \| \| \| \|	Enable PseudoElement in scss-lintenable-scss-lint-pseudo-element	Clement Ho	2016-10-26	12	-28/+28
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch '22746-fix-admin-users-mobile-view' into 'master'	Annabel Dunstone Gray	2016-10-26	3	-0/+11
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Admin/Overview/Users mobile view" ## What does this MR do? Fixes mobile layout issues on `/admin/users` page. * Fixes control element placement when long usernames or email addresses overflow their container * Fixes condensed dropdown menu (issue caused by acde2e30) Before: ![Screen_Shot_2016-09-28_at_3.29.11_PM](/uploads/82cd27c367653beb29425065685274dd/Screen_Shot_2016-09-28_at_3.29.11_PM.png) ![Screen_Shot_2016-09-29_at_23.36.40](/uploads/e739638506388be9c5a0709e5f22b298/Screen_Shot_2016-09-29_at_23.36.40.png) After: ![Screen_Shot_2016-10-24_at_11.55.32_PM](/uploads/ab6e49da85688d9fd2abc49de238a5bf/Screen_Shot_2016-10-24_at_11.55.32_PM.png) ## Are there points in the code the reviewer needs to double check? Ensure css changes don't have any side effects elsewhere in GitLab. (I don't think they would...) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22746 See merge request !7087
\| * \| \| \| \| \|	update CHANGELOG.md to reflect changes in !708722746-fix-admin-users-mobile-view	Mike Greiling	2016-10-26	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	prevent long usernames or user emails from breaking mobile layout on ↵	Mike Greiling	2016-10-26	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	admin/overview/users