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	10	-38/+69
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	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	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+1
\| \|
* \|	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	2	-0/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Add disable_two_factor route for Admin::Users	Robert Speicher	2015-07-10	1	-0/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-disable-2fa' into 'master'	Dmitriy Zaporozhets	2015-07-13	2	-7/+11
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-13/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \|	Fix transferring of project to another group using the API.	Douwe Maan	2015-07-11	3	-13/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'hsts-check-port-443' into 'master'	Marin Jankovski	2015-07-13	1	-1/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+4
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/9449
* \| \| \| \| \|	Merge branch 'search-git-grep' into 'master'	Dmitriy Zaporozhets	2015-07-12	3	-0/+36
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \|	Add tests for repository search files	Dmitriy Zaporozhets	2015-07-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
* \| \| \| \| \|	Better handle unknown projects and groups for autocomplete	Stan Hu	2015-07-11	1	-14/+23
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'fix-autocomplete-with-public-projects' into 'master'	Hannes Rosenögger	2015-07-11	1	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1955
* \| \| \| \| \|	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 '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
* \| \| \|	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>
* \| \| \|	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>
* \| \| \|	Merge branch 'fork_visibility_level' into 'master'	Dmitriy Zaporozhets	2015-07-10	4	-1/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Forks should not have more permissive visibility levels than the original https://dev.gitlab.org/gitlab/gitlabhq/issues/2286 See merge request !936
\| * \| \| \|	Fork visibility level fixfork_visibility_level	Valery Sizov	2015-07-06	4	-1/+18
\| \| \| \| \|
* \| \| \| \|	Merge branch 'hierarchical-navigation'	Dmitriy Zaporozhets	2015-07-10	3	-1/+32
\|\ \ \ \ \
\| * \| \| \| \|	Better name for group tabhierarchical-navigation	Dmitriy Zaporozhets	2015-07-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Make left menu more hierarchical and less contextual by adding back item at top	Dmitriy Zaporozhets	2015-07-10	3	-0/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Fix missing avatar in event feed when created project	Dmitriy Zaporozhets	2015-07-10	1	-0/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'comment-box-changes' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-07-10	4	-6/+12
\|\ \ \ \ \
\| * \| \| \| \|	Fixed the issuescomment-box-changes	Darby	2015-07-09	3	-3/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Comment box/Placeholder text redo	Darby	2015-07-01	4	-6/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Reset ul list style types inside notesrs-issue-1939	Robert Speicher	2015-07-09	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #259
* \| \| \| \| \|	Style all blockquote children, not just p	Robert Speicher	2015-07-09	1	-1/+1
\| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1939
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-07-09	2	-1/+6
\|\ \ \ \ \
\| * \| \| \| \|	Cache readme rendering result	Dmitriy Zaporozhets	2015-07-09	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-07-09	1	-1/+1
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge pull request #9438 from bbodenmiller/patch-3	Dmitriy Zaporozhets	2015-07-09	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	dont -> don't
\| \| * \| \| \| \|	dont -> don't	Ben Bodenmiller	2015-07-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update "You dont have any authorized applications" to "You don't have any authorized applications"
* \| \| \| \| \| \|	Merge branch 'edit-readme' into 'master'	Dmitriy Zaporozhets	2015-07-09	1	-4/+5
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show edit readme from project home page I added pencil icon which redirect you to edit README page (web editor). In this case people can make changes to README easily without going to Files tab, searching for README and pressing edit button here cc @job @darby Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1892