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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add defaults for incoming_email ssl and start_tls.incoming-email-config	Douwe Maan	2015-10-14	1	-4/+6
\|
*	Make Reply by email easier to configure	Douwe Maan	2015-10-13	10	-254/+199
\|
*	Remove warning about Reply by email and HAmailroom-arbitration	Douwe Maan	2015-10-12	1	-4/+0
\|
*	Enable arbitration in MailRoom	Douwe Maan	2015-10-11	4	-4/+44
\|
*	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
* \| \| \|	Merge branch 'rs-mr-tab-loader' into 'master'	Douwe Maan	2015-10-09	1	-5/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the loading spinner toggle more explicit Occasionally the loading spinner would stay visible after the tab finished loading. This change makes the toggle explicit so that it's always shown on `beforeSend`, and always hidden on `complete`. Plus a bonus semi-colon eradication! :boom: See merge request !1553
\| * \| \| \|	Make the loading spinner toggle more explicitrs-mr-tab-loader	Robert Speicher	2015-10-08	1	-5/+8
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Occasionally the loading spinner would stay visible after the tab finished loading. This change makes the toggle explicit so that it's always shown on `beforeSend`, and always hidden on `complete`. Plus a bonus semi-colon eradication! :boom:
* \| \| \|	Merge branch 'clarify_support' into 'master'	Sytse Sijbrandij	2015-10-09	1	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify support request message Since we have the (GitLab.com) Support Forum, this message may be slightly confusing. Hopefully this wording improves understanding. If anyone has suggestions on making this clearer I'm open. See merge request !1406
\| * \| \| \|	Clarify support request message	Drew Blessing	2015-10-08	1	-1/+5
\| \|/ / /
* \| \| \|	Merge branch 'rs-2fa-task' into 'master'	Jacob Vosmaer	2015-10-09	2	-0/+37
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add task to disable 2FA for all users Addresses #2971 See merge request !1532
\| * \| \| \|	Add output and confirmation to gitlab:two_factor:disable_for_all_usersrs-2fa-task	Robert Speicher	2015-10-08	1	-2/+15
\| \| \| \| \|
\| * \| \| \|	Add docs for gitlab:two_factor:disable_for_all_users task	Robert Speicher	2015-10-07	1	-0/+14
\| \| \| \| \|
\| * \| \| \|	Add gitlab:two_factor:disable_for_all_users task	Robert Speicher	2015-10-07	1	-0/+10
\| \| \| \| \|
* \| \| \| \|	Merge branch 'improve_empty_fork' into 'master'	Dmitriy Zaporozhets	2015-10-09	1	-29/+34
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show message if user tries to fork and has no available namespaces This merge request improves the UX when users try to fork a project and have no eligible namespaces. ### Current behavior ![Screen_Shot_2015-09-25_at_1.39.45_PM](https://gitlab.com/dblessing/gitlab-ce/uploads/45a303703a0197e78f7f9bdbea8718b5/Screen_Shot_2015-09-25_at_1.39.45_PM.png) ### Proposed behavior ![Screen_Shot_2015-09-25_at_1.38.57_PM](https://gitlab.com/dblessing/gitlab-ce/uploads/613c53bcfb52d79fdf8bd1d09410c152/Screen_Shot_2015-09-25_at_1.38.57_PM.png) ### Things to check I'm not exactly loving the wording I have here. I'm open to improvements. See merge request !1441
\| * \| \| \| \|	Show message if user tries to fork and has no available namespaces	Drew Blessing	2015-10-08	1	-29/+34
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'fix-header-hamburger-positioning' into 'master'	Dmitriy Zaporozhets	2015-10-09	3	-2/+7
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed positioning of hamburger menu on header Hey guys just noticed the hamburger menu for the top navigation was mis-aligned on `gitlab-ce:master` and `gitlab.com`. I was not able to find an open issue or merge request directly referencing this issue so thought I would add a quick fix. ### Changes This MR changes the vertical positioning from `top` to vertical margins (Like in bootstrap itself). - Also added a minor fix to remove `border-top` from the collapse menu so its the same height as the navigation. - finally added an active class to the hamburger toggle so you can see when its open. This changes an element in `app/views/layouts/header/_default.html.haml` and thus would impact most pages behind login. ## Screenshots ### Before ![before](https://gitlab.com/hanloong/gitlab-ce/uploads/e3d4631dd0420ec0e9048c435a2f734b/before.png) ### After ![after](https://gitlab.com/hanloong/gitlab-ce/uploads/7c93c3ef1b01fbefc39c5a1ed61c2d1b/after.png) Happy to discuss any changes/suggestions. Thanks See merge request !1541
\| * \| \| \|	fixed positioning of hamburger menu on header	Han Loong Liauw	2015-10-09	3	-2/+7
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Changed to margin for vertical allign as used in bootstrap 3 original - Also added an `active` state to show when the extra items are enabled
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Stan Hu	2015-10-08	1	-1/+6
\|\ \ \ \
\| * \ \ \	Merge branch 'workaround-seed-fu-issue' into 'master'	Douwe Maan	2015-10-08	1	-1/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes GDK issue where repos would not be imported properly Seed-Fu runs this entire fixture in a transaction, so the `after_commit` hook won't run until after the fixture is loaded. That is too late since the Sidekiq::Testing block has already exited. Force clearing the `after_commit` queue to ensure the job is run now. See: gitlab-org/gitlab-development-kit#58 See merge request !1513
\| \| * \| \| \|	Verify repository is valid	Stan Hu	2015-10-06	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Fixes GDK issue where repos would not be imported properly	Stan Hu	2015-10-05	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Seed-Fu runs this entire fixture in a transaction, so the `after_commit` hook won't run until after the fixture is loaded. That is too late since the Sidekiq::Testing block has already exited. Force clearing the `after_commit` queue to ensure the job is run now. See: gitlab-org/gitlab-development-kit#58
* \| \| \| \| \|	Merge pull request #9693 from bbodenmiller/patch-1	Stan Hu	2015-10-08	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	allow crawling of commit page but not patch/diffs
\| * \| \| \| \|	allow crawling of commit page but not patch/diffs	Ben Bodenmiller	2015-10-04	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit page has valuable information that search engines should be allowed to crawl however the .patch and .diff pages have no new information that is not on commit page
* \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-10-08	2	-3/+12
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'update-upgrade-guide-for-redis-2.4.0' into 'master'	Stan Hu	2015-10-08	2	-3/+12
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update upgrade guide for Redis >= 2.4.0 requirement [ci skip] Closes #2837 See merge request !1468
\| \| * \| \| \| \| \|	Update upgrade guide for Redis >= 2.4.0 requirement	Stan Hu	2015-10-01	2	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Closes #2837
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'public/project-find-with-namespace-performance'	Dmitriy Zaporozhets	2015-10-08	11	-8/+301
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Added changelog for project namespace performance	Yorick Peterse	2015-10-08	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Added dedicated Rake task for setting up Postgres	Yorick Peterse	2015-10-08	2	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures any PostgreSQL specific schema changes (e.g. expression indexes) are created when setting up the database.
\| * \| \| \| \| \| \|	Revamp finding projects by namespaces	Yorick Peterse	2015-10-08	6	-24/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By using a JOIN we can remove the need for using 2 separate queries to find a project by its namespace. Combined with an index (only needed for PostgreSQL) this reduces the query time from ~245 ms (~520 ms for the first call) down to roughly 10 ms (~15 ms for the first call).
\| * \| \| \| \| \| \|	Added concern for case-insensitive WHERE queries	Yorick Peterse	2015-10-07	2	-0/+204
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On PostgreSQL these queries use LOWER(...) to compare columns and values. For MySQL a regular WHERE is performed as MySQL is already case-insensitive.
\| * \| \| \| \| \| \|	Added methods for detecting MySQL/PostgreSQL	Yorick Peterse	2015-10-07	2	-0/+28
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These two methods remove the need for manually going into ActiveRecord::Base.connection all over the place.