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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow user to specify content he wants to see on project pageproject-default-view	Dmitriy Zaporozhets	2015-07-13	13	-39/+82
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'no-icon-for-back' into 'master'	Dmitriy Zaporozhets	2015-07-13	6	-6/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide icon for bact-to-location menu in sidebar cc @JobV ![Screenshot_2015-07-13_11.37.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/39d871b6a0e0e555cb497aee865a2f45/Screenshot_2015-07-13_11.37.39.png) See merge request !968
\| *	Hide icon for bact-to-location menu in sidebar	Dmitriy Zaporozhets	2015-07-13	6	-6/+12
\|/ \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'ssh-key-linebreaks' into 'master'	Dmitriy Zaporozhets	2015-07-13	3	-1/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add error message for SSH key linebreaks Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/5653544-check-for-linebreaks-in-ssh-key). See merge request !672
\| *	Add error message for SSH key linebreaks	Nikita Verkhovin	2015-07-12	3	-1/+9
\| \|
* \|	Merge branch 'rs-issue-1908' into 'master'	Dmitriy Zaporozhets	2015-07-13	6	-2/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Safari/iOS and Windows 8 logo information Now that we've got our :fire: new logo, let's spread it around a bit more! Closes #1908 See merge request !944
\| * \|	Update msapplication-TileColor valuers-issue-1908	Robert Speicher	2015-07-10	1	-1/+1
\| \| \|
\| * \|	Update background color for touch-icon-* images	Robert Speicher	2015-07-10	4	-0/+0
\| \| \|
\| * \|	Add Windows 8 pinned site tile meta tags	Robert Speicher	2015-07-09	2	-0/+4
\| \| \|
\| * \|	Add Safari/iOS versions of the logo	Robert Speicher	2015-07-09	5	-2/+13
\| \| \|
* \| \|	Merge branch 'vis_btn_color_change' into 'master'	Dmitriy Zaporozhets	2015-07-13	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed the color of admin/application_settings buttons Now they look like this: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a43c0c7fada5768bddda6e3449b37a5e/image.png) gray when selected, white when not. See merge request !887
\| * \| \|	Changed to using the btn classvis_btn_color_change	Darby	2015-07-10	3	-15/+2
\| \| \| \|
\| * \| \|	Changed the color of admin/application_settings buttons	Darby	2015-06-24	2	-1/+14
\| \| \| \|
* \| \| \|	Merge branch 'rs-disable-2fa-by-admin' into 'master'	Dmitriy Zaporozhets	2015-07-13	6	-0/+70
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow admins to disable 2FA for a user > ![Screen_Shot_2015-07-10_at_5.19.13_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3f9bb7c783110d2689c282879cb4b061/Screen_Shot_2015-07-10_at_5.19.13_PM.png) Depends on !961 See merge request !962
\| * \| \| \|	Add a button to Admin::Users#show to disable 2FA for that userrs-disable-2fa-by-admin	Robert Speicher	2015-07-10	3	-0/+35
\| \| \| \| \|
\| * \| \| \|	Add disable_two_factor route for Admin::Users	Robert Speicher	2015-07-10	3	-0/+35
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-disable-2fa' into 'master'	Dmitriy Zaporozhets	2015-07-13	5	-17/+33
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add User#disable_two_factor! This method encapsulates all the logic for disabling 2FA on a specific User model. See merge request !961
\| * \| \| \|	Add User#disable_two_factor!rs-disable-2fa	Robert Speicher	2015-07-10	5	-17/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method encapsulates all the logic for disabling 2FA on a specific User model.
* \| \| \| \|	Merge branch 'fix-api-project-transfer' into 'master'	Dmitriy Zaporozhets	2015-07-13	6	-20/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix transferring of project to another group using the API. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2397. See merge request !926
\| * \| \| \| \|	Update specs.fix-api-project-transfer	Douwe Maan	2015-07-11	1	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Fix transferring of project to another group using the API.	Douwe Maan	2015-07-11	5	-15/+15
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'hsts-check-port-443' into 'master'	Marin Jankovski	2015-07-13	2	-1/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only enable HSTS header for HTTPS and port 443 ### What does this MR do? This MR adds a check that the port used is 443, in addition to HTTPS being enabled, when activating the HSTS header. ### Why was this MR needed? If a user is using a non-standard port for SSL, enabling this header would send clients to port 443 when that port is invalid. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9449 See merge request !966
\| * \| \| \| \| \|	Only enable HSTS header for HTTPS and port 443	Stan Hu	2015-07-12	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/9449
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-07-12	9	-30/+178
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'search-git-grep' into 'master'	Dmitriy Zaporozhets	2015-07-12	5	-0/+61
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement faster search of code (via git grep) Much faster than iterating over each file using rugged. Performance compare for Linux repository using keyword `sha`: ``` OLD: 250 seconds NEW: 9 seconds ``` See merge request !957
\| \| * \| \| \| \| \|	Mention search improvements in CHANGELOG	Dmitriy Zaporozhets	2015-07-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Add tests for repository search files	Dmitriy Zaporozhets	2015-07-12	2	-1/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Fix search blobs for wiki	Dmitriy Zaporozhets	2015-07-12	3	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Implement search of code via git grepsearch-git-grep	Dmitriy Zaporozhets	2015-07-10	2	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Merge branch 'improve-autocomplete-controller-for-unknowns' into 'master'	Hannes Rosenögger	2015-07-11	2	-29/+86
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better handle unknown projects and groups for autocomplete While working on !963, I noticed that specifying an unknown project ID or group ID would cause an error in the controller. This MR improves on the handling of unknown projects or groups: 1. If the user is authenticated, return a blank JSON with a 404 error. 2. Otherwise, redirect the user to login so we don't leak information about whether certain projects/groups exist. See merge request !964
\| \| * \| \| \| \| \|	Better handle unknown projects and groups for autocomplete	Stan Hu	2015-07-11	2	-29/+86
\| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'fix-changelog-typos' into 'master'	Stan Hu	2015-07-11	1	-2/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo and remove duplicate entry shipped in v7.12.2 See merge request !965
\| \| * \| \| \| \|	Fix typo and remove duplicate entry shipped in v7.12.2	Stan Hu	2015-07-11	1	-2/+1
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'fix-autocomplete-with-public-projects' into 'master'	Hannes Rosenögger	2015-07-11	3	-1/+30
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix user autocomplete for unauthenticated users accessing public projects Closes #1955 See merge request !963
\| \| * \| \| \| \|	Fix user autocomplete for unauthenticated users accessing public projects	Stan Hu	2015-07-10	3	-1/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1955
\| * \| \| \| \| \|	Merge branch 'fix-multiple-dropzone-icons' into 'master'	Dmitriy Zaporozhets	2015-07-10	1	-3/+3
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not add the same icon multiple times to dropzones Some DOM queries were to broad which caused paperclip icons and spinners to be added multiple times to a dropzone in case of multiple dropzones on a page. ![gitlab-dropzone-icon-bug](https://gitlab.com/dgerhardt/gitlab-ce/uploads/23e558a375cece21cc7af410e3839e05/gitlab-dropzone-icon-bug.png) Steps to reproduce: 1. Open an existing issue or merge request with comments. 2. Move a file over the new comment dropzone. One paperclip icon should appear. 3. Now click the edit button for an existing comment and repeat step 2. You should see two paperclips. Fixes #1725. See merge request !959
\| \| * \| \| \| \| \|	Do not add the same icon multiple times to dropzones	Daniel Gerhardt	2015-07-10	1	-3/+3
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some DOM queries were to broad which caused paperclip icons and spinners to be added multiple times to a dropzone in case of multiple dropzones on a page.
\| * \| \| \| \| \|	Merge branch 'fig-info' into 'master'	Sytse Sijbrandij	2015-07-10	1	-3/+5
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	information about why we use fig.yml Because of tweet https://twitter.com/nicholasruunu/status/619533541605539841 cc/ @sytses @ayufan See merge request !960
\| \| * \| \| \| \|	information about why we use fig.yml	karen Carias	2015-07-10	1	-3/+5
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'link-multiple-issues' into 'master'	Sytse Sijbrandij	2015-07-10	1	-0/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added link to issue closing pattern documentation in milestones doc Added link from Milestones doc to Issue closing pattern because I think they can be useful. Because of Tweet https://twitter.com/steenwijkict/status/619210265008205824 cc/ @sytse See merge request !1895
\| * \| \| \| \|	added link to issue closing pattern in doc	karen Carias	2015-07-10	1	-0/+2
\|/ / / / /
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Sytse Sijbrandij	2015-07-10	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: docker/marathon.json
\| * \| \| \| \|	Update image to latest one	Sytse Sijbrandij	2015-07-10	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'fix-migrating-from-svn-doc-link' into 'master'	Stan Hu	2015-07-10	1	-1/+1
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix migrating from SVN document link Closes #1959 See merge request !958
\| \| * \| \| \|	Fix migrating from SVN document link	Stan Hu	2015-07-10	1	-1/+1
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1959
* \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Sytse Sijbrandij	2015-07-10	23	-17/+189
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'compact-sidebar' into 'master'	Dmitriy Zaporozhets	2015-07-10	1	-6/+3
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Smaller font and leing height for sidebar elements Recently we added few more entries to project sidebar navigation making it overflow on laptops 1280x720 resolution now: ![Screenshot_2015-07-10_15.34.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/19f5c77e5d19cf935a4323a079020f7b/Screenshot_2015-07-10_15.34.52.png) After this fix: ![Screenshot_2015-07-10_15.34.35](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ca9cdcc2ce9c9b6aabb823ba64a3a30a/Screenshot_2015-07-10_15.34.35.png) This should help for people who use scaling with retina or owners of MacBook Air laptops cc @JobV See merge request !955
\| \| * \| \| \|	Smaller font and leing height for sidebar elements	Dmitriy Zaporozhets	2015-07-10	1	-6/+3
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Merge branch 'labels-small-buttons' into 'master'	Dmitriy Zaporozhets	2015-07-10	1	-2/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make edit/remove label buttons smaller ## Before ![Screenshot_2015-07-10_14.29.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/bc7a4886997ab194c1213f38f163b269/Screenshot_2015-07-10_14.29.46.png) ## After ![Screenshot_2015-07-10_14.31.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ebb386a38e264ca7b50dc08891cb919c/Screenshot_2015-07-10_14.31.09.png) See merge request !954
\| \| * \| \| \|	Make edit/remove label buttons smallerlabels-small-buttons	Dmitriy Zaporozhets	2015-07-10	1	-2/+2
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>