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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Small css cleanupcss-cleanup	Dmitriy Zaporozhets	2015-10-13	7	-25/+12
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'ui-improvements' into 'master'	Dmitriy Zaporozhets	2015-10-13	5	-8/+23
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ui improvements * fix dashboard projects page for mobile * fix project home page for mobile * remove gray padding for small screens * render no-ssh message same like we do for flash messages cc @skyruler See merge request !1581
\| *	Several fixes for UI on mobile	Dmitriy Zaporozhets	2015-10-13	2	-3/+12
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Fix UI issue on project page with no ssh key message	Dmitriy Zaporozhets	2015-10-13	2	-4/+6
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Fix control buttons in lists	Dmitriy Zaporozhets	2015-10-13	1	-1/+5
\|/ \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'refactor-styles' into 'master'	Dmitriy Zaporozhets	2015-10-13	9	-170/+172
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Refactor styles cc @skyruler See merge request !1577
\| *	Temporary return sm and xs button sizes	Dmitriy Zaporozhets	2015-10-13	1	-1/+9
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Remove unused twbs components	Dmitriy Zaporozhets	2015-10-13	2	-3/+0
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Fix padding for controls in list	Dmitriy Zaporozhets	2015-10-13	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Rename bootstrap css file and refactor typography css	Dmitriy Zaporozhets	2015-10-13	6	-165/+162
\|/ \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'refactor-styles' into 'master'	Dmitriy Zaporozhets	2015-10-13	40	-34/+48
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor css structure Related to #3025 cc @skyruler @DouweM @rspeicher @vsizov See merge request !1571
\| *	Fix typos in application.scssrefactor-styles	Dmitriy Zaporozhets	2015-10-12	1	-4/+4
\| \|
\| *	Add css welcome notice	Dmitriy Zaporozhets	2015-10-12	1	-6/+14
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Re-organize GitLab css into 2 directories: framework and page specific css	Dmitriy Zaporozhets	2015-10-12	34	-28/+34
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Move CI styles to pages dir	Dmitriy Zaporozhets	2015-10-12	6	-0/+0
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'update_changelog2' into 'master'	Valery Sizov	2015-10-13	1	-0/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update changelog https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1559 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1558 See merge request !1576
\| * \|	update changelog	Valery Sizov	2015-10-13	1	-0/+2
\|/ /
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Stan Hu	2015-10-12	22	-43/+198
\|\ \
\| * \	Merge branch 'reset_service_password' into 'master'	Dmitriy Zaporozhets	2015-10-12	6	-0/+158
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Invalidate stored service password if the endpoint URL is changed See merge request !1558
\| \| * \|	Invalidate stored service password if the endpoint URL is changedreset_service_password	Valery Sizov	2015-10-12	6	-0/+158
\| \| \| \|
\| * \| \|	Merge branch 'spellcheck_false' into 'master'	Dmitriy Zaporozhets	2015-10-12	12	-12/+12
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spellcheck=false to certain input fields https://dev.gitlab.org/gitlab/gitlabhq/issues/2563 See merge request !1559
\| \| * \| \|	Add spellcheck=false to certain input fieldsspellcheck_false	Valery Sizov	2015-10-12	12	-12/+12
\| \| \|/ /
\| * \| \|	Merge branch 'fix-patch_guide' into 'master'	Hannes Rosenögger	2015-10-12	1	-2/+4
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don't set LATEST_TAG automatically in patch update guide As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/2607, this removes the automatic setting of the LATEST_TAG variable in the update guide, because it could get set to rc versions. Instead, a command was added to list all tags, with the most recent one being on the end of the list. Also a note was added to prevent users from updating to new minor/major versions because the tag list includes all tags. [ci skip] See merge request !1510
\| \| * \|	don't set LATEST_TAG automatically in patch update guide	Jan Bruckner	2015-10-05	1	-2/+4
\| \| \| \|
\| * \| \|	Merge branch 'docs-update' into 'master'	Hannes Rosenögger	2015-10-12	1	-28/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed extra_sign_in_text examples for gitlab.rb [ci skip] I removed the extra_sign_in_text option documentation. This is no longer needed because a welcome message aka. extra_sign_in_text can now be set/changed in the admin UI. Admin area > Settings This was mentioned in issue #3006 See merge request !1565
\| \| * \| \|	removed extra_sign_in_text examples for gitlab.rb [ci skip]	Dale Noe	2015-10-11	1	-28/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fix_email_downcasing' into 'master'	Robert Speicher	2015-10-11	2	-1/+22
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LDAP email address downcasing Fixes #2960 In the event we cannot match an LDAP user by DN we attempt to find an identity by email address and then update the DN. In this case the identity is matched by email address. If the user's email address in LDAP has an upper case character we cannot find a match in the GitLab database. GitLab downcases emails before the user object is saved. This merge request downcases the email from LDAP before we lookup by email. I also added a test to prevent a regression. See merge request !1550
\| \| * \| \|	Fix ldap email downcasing bug	Drew Blessing	2015-10-08	2	-1/+22
\| \| \| \| \|
* \| \| \| \|	Merge pull request #9719 from teuneboon/master	Stan Hu	2015-10-12	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Small typo fix when deleting groups
\| * \| \| \|	Make group deleted text consistent with group created and updated texts	teuneboon	2015-10-12	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fix typo(missing quote) when deleting groups	teuneboon	2015-10-12	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch 'rs-remove-slim' into 'master'	Dmitriy Zaporozhets	2015-10-10	2	-6/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove slim Closes #2897 See merge request !1537
\| * \| \| \|	Remove slimrs-remove-slim	Robert Speicher	2015-10-08	2	-6/+0
\| \|/ / /
* \| \| \|	Add CHANGELOG entry for !1543	Robert Speicher	2015-10-10	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'master' into 'master'	Robert Speicher	2015-10-10	1	-7/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Persist filters when sorting on user admin page Closes #2806 See merge request !1543
\| * \| \| \|	Persist filters when sorting on user admin page	Jerry Lukins	2015-10-10	1	-7/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-remove-button-alignment' into 'master'	Dmitriy Zaporozhets	2015-10-10	1	-2/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In SSH key detailed view, align the "Remove" button with the right container Also fixes a bootlint warning. Before: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d6d8765ed9dceb6a31a6b4475b2166e1/image.png) After: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/8252211125ace212335aa6bf2ba78549/image.png) See merge request !1555
\| * \| \| \| \|	In SSH key detailed view, align the "Remove" button with the right container	Stan Hu	2015-10-09	1	-2/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'make-diff-css-better-for-mobile' into 'master'	Dmitriy Zaporozhets	2015-10-10	4	-45/+90
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make diff file view easier to use on mobile screens Viewing diffs on a mobile screen is a bit of an awkward experience at the moment. Here are a few issues (by no means complete): ## Before ### Tabs are scrunched ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/45924e36cfb107dc56795a7dcdfbc5b5/image.png) ### Filenames take too much room, buttons cluttered ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/a5e5611271fe26dfd3922aa0b8780458/image.png) ## After This MR makes a few tweaks to make this a bit better. It just addresses a few issues, but there is plenty of room for improvement (e.g. shrink fonts, etc.): ### Eliminate padding to make tabs fit ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fbcf128d1f221b9b9e53df274238dc62/image.png) ### Make filenames, buttons more readable This screenshot allows the filename to use the whole row, omits the file mode changes, and puts the buttons centered in the view: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d2e5b9424f058827ba2552056c516e18/image.png) Towards a better mobile experience: #2787 See merge request !1449
\| * \| \| \| \| \|	Make diff file view easier to use on mobile screens	Stan Hu	2015-10-09	4	-45/+90
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-update-whenever' into 'master'	Dmitriy Zaporozhets	2015-10-10	2	-8/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove whenever gem Closes #2879 See merge request !1538
\| * \| \| \| \| \|	Just kidding, we're deleting whenever entirelyrs-update-whenever	Robert Speicher	2015-10-08	2	-7/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update whenever to ~> 0.9.4	Robert Speicher	2015-10-07	2	-4/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update monthly release post template	Robert Speicher	2015-10-09	1	-7/+6
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'update-changelog-for-emoji-fix' into 'master'	Stan Hu	2015-10-09	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG for Emoji fix in a3c6ed5c4 [ci skip] See merge request !1556
\| * \| \| \| \| \|	Update CHANGELOG for Emoji fix in a3c6ed5c4	Stan Hu	2015-10-09	1	-0/+1
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'fix-issue-filter-dropdown-labels' into 'master'	Dmitriy Zaporozhets	2015-10-09	6	-6/+16
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore placeholders in issue filters from "Any" to "Milestone" and "Label" 1f11096c included new filters but made it hard to determine which dropdown did what. This patch restores the original placeholders. ### Before ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2326b836e364275341ea0ad8c0a0926b/image.png) ### After ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/b0e519f9cf8d1a3c0f054286e3b809cb/image.png) See merge request !1554
\| * \| \| \| \|	Restore placeholders in issue filters from "Any" to "Milestone" and "Label"	Stan Hu	2015-10-08	6	-6/+16
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1f11096c included new filters but made it hard to determine which dropdown did what. This patch restores the original placeholders.
* \| \| \| \|	Merge branch 'rs-issue-2970' into 'master'	Douwe Maan	2015-10-09	2	-1/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Normalize space-like characters in keys before output to gitlab-shell gitlab-shell expects only one tab separator per key, and an SSH key with a tab character in the comment, for example, would break things. Closes #2970 See merge request !1552
\| * \| \| \| \|	Normalize space-like characters in keys before output to gitlab-shellrs-issue-2970	Robert Speicher	2015-10-08	2	-1/+15
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab-shell expects only one tab separator per key, and an SSH key with a tab character in the comment, for example, would break things. Closes #2970