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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Correctly remove already-mentioned commits for cross referencesrs-issue-1778	Robert Speicher	2015-06-08	2	-3/+26
\| \| \| \|	Fixes #1778
*	Fix broadcast message colors to one displayed in preview	Dmitriy Zaporozhets	2015-06-08	1	-2/+2
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-08	23	-52/+65
\|\
\| *	Merge branch 'improve-navigation' into 'master'	Dmitriy Zaporozhets	2015-06-08	23	-52/+65
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve GitLab UI * move logout button to top right ![Screenshot_2015-06-08_16.56.13](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7de04fab52ad6b742dbea100674f9671/Screenshot_2015-06-08_16.56.13.png) * remove issue/mr title truncation on index pages. For smaller screens it allow to read complete title of issue ![Screenshot_2015-06-08_16.57.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9dcaadfba14f8561c12fcd29a2e70112/Screenshot_2015-06-08_16.57.55.png) * Improve mobile UI for several pages See merge request !783
\| \| *	Properly click on user profile pictureimprove-navigation	Dmitriy Zaporozhets	2015-06-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| *	Fix tests	Dmitriy Zaporozhets	2015-06-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| *	Remove arrow to the right of project name on dashboard	Dmitriy Zaporozhets	2015-06-08	2	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| *	Improve UI for phones	Dmitriy Zaporozhets	2015-06-08	3	-4/+20
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| *	Dont use fixed pixel size if form controls - its bad for mobile devices	Dmitriy Zaporozhets	2015-06-08	9	-18/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| *	Fix header for mobiles	Dmitriy Zaporozhets	2015-06-08	2	-5/+13
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| *	Dont truncate issue/mr title	Dmitriy Zaporozhets	2015-06-08	3	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| *	Move logout buttom to top right corner	Dmitriy Zaporozhets	2015-06-08	4	-18/+12
\| \|/ \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'importing-fix' into 'master'	Job van der Voort	2015-06-08	8	-9/+41
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	importing documents renewed Single commit of !1813 cc @karen See merge request !1844
\| *	fix spacing in document	Job van der Voort	2015-06-08	1	-8/+5
\| \|
\| *	importing documents renewed	Job van der Voort	2015-06-08	8	-9/+44
\|/
*	Merge branch 'master' into 'master'	Sytse Sijbrandij	2015-06-06	1	-1/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc: Added FreeOTP to 2FA I have just added a note about a free alternative to Google Authenticator to the documentation of your two factor authentication. See merge request !777
\| *	Changed spelling	rugk	2015-06-06	1	-1/+1
\| \|
\| *	Escaped(?)	rugk	2015-06-05	1	-1/+1
\| \|
\| *	Added free alternative to Google Authenticator (FreeOTP).	rugk	2015-06-05	1	-1/+3
\| \|
* \|	Merge branch 'cleaner-project-page' into 'master'	Dmitriy Zaporozhets	2015-06-05	1	-5/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove line under project description ## Before ![Screenshot_2015-06-05_19.44.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e80e03a15ff32de489e61662674f8b70/Screenshot_2015-06-05_19.44.39.png) ## After ![Screenshot_2015-06-05_19.44.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d4e2eb43802dbeee397fb6bc051b82b2/Screenshot_2015-06-05_19.44.19.png) See merge request !776
\| * \|	Remove line under project description	Dmitriy Zaporozhets	2015-06-05	1	-5/+3
\|/ / \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Jacob Vosmaer	2015-06-05	4	-17/+16
\|\ \
\| * \	Merge branch 'header-50-px' into 'master'	Dmitriy Zaporozhets	2015-06-05	4	-17/+16
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix css alignment in header. Use scss variable Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !775
\| \| * \|	Fix css alignment in header. Use scss variable	Dmitriy Zaporozhets	2015-06-05	4	-17/+16
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Jacob Vosmaer	2015-06-05	45	-280/+570
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-05	45	-280/+570
\| \|\ \
\| \| * \	Merge branch 'refactor-web-editor' into 'master'	Dmitriy Zaporozhets	2015-06-05	9	-179/+149
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor web editor * fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #1761 See merge request !773
\| \| \| * \|	Fix editing files via API	Dmitriy Zaporozhets	2015-06-05	1	-24/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| \| * \|	Refactor web editorrefactor-web-editor	Dmitriy Zaporozhets	2015-06-05	8	-155/+123
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Improve instructions for publishing gitlab-app.	Sytse Sijbrandij	2015-06-05	1	-3/+5
\| \| \| \| \|
\| \| * \| \|	Merge branch 'warn-about-referenced-users' into 'master'	Dmitriy Zaporozhets	2015-06-05	21	-60/+133
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show warning when a comment will add 10 or more people to the discussion. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2054 New issue: ![Screen_Shot_2015-06-02_at_14.48.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6771ff8748b9b548a9f0f32a5a8b9bb1/Screen_Shot_2015-06-02_at_14.48.46.png) New comment: ![Screen_Shot_2015-06-02_at_14.48.51](https://gitlab.com/gitlab-org/gitlab-ce/uploads/25ec5f06490e1e6b36e453e055a7b403/Screen_Shot_2015-06-02_at_14.48.51.png) See merge request !754
\| \| \| * \| \|	Prefer jQuery on to bind, and don't use .js class.warn-about-referenced-users	Douwe Maan	2015-06-05	4	-8/+8
\| \| \| \| \| \|
\| \| \| * \| \|	Show warning when a comment will add 10 or more people to the discussion.	Douwe Maan	2015-06-05	21	-59/+132
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'wip-mr-docs' into 'master'	Dmitriy Zaporozhets	2015-06-05	6	-3/+17
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add info about WIP merge requests to docs. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2078. See merge request !770
\| \| \| * \| \| \|	Add info about WIP merge requests to docs.wip-mr-docs	Douwe Maan	2015-06-05	6	-3/+17
\| \| \| \|/ / /
\| \| * \| \| \|	Merge branch 'fix-long-blob-timeout' into 'master'	Dmitriy Zaporozhets	2015-06-05	2	-1/+3
\| \| \|\ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix timeout when rendering file with thousands of lines. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2354. See merge request !771
\| \| \| * \| \|	Fix timeout when rendering file with thousands of lines.fix-long-blob-timeout	Douwe Maan	2015-06-05	2	-1/+3
\| \| \|/ / /
\| \| * \| \|	Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'	Douwe Maan	2015-06-05	5	-15/+221
\| \| \|\ \ \
\| \| \| * \| \|	Tweak code.cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth	Douwe Maan	2015-06-05	1	-21/+24
\| \| \| \| \| \|
\| \| \| * \| \|	Add option to automatically link omniauth and LDAP identities	Alex Lossent	2015-06-03	5	-16/+219
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Until now, a user needed to first sign in with his LDAP identity and then manually link his/her account with an omniauth identity from their profile. Only when this is done can the user authenticate with the omniauth provider and at the same time benefit from the LDAP integration (HTTPS authentication with LDAP username/password and in EE: LDAP groups, SSH keys etc.). This feature automates the process by looking up a corresponding LDAP person when a user connects with omniauth for the first time and then automatically linking the LDAP and omniauth identities (of course, like the existing allow_single_sign_on setting, this is meant to be used with trusted omniauth providers). The result is identical to a manual account link. Add config initializers for other omniauth settings.
\| \| * \| \| \|	Merge branch 'fix-empty-navbar' into 'master'	Dmitriy Zaporozhets	2015-06-05	2	-1/+6
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix empty header margin See merge request !769
\| \| \| * \| \|	Fix empty header	Dmitriy Zaporozhets	2015-06-05	2	-1/+6
\| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Merge branch 'improve_bitbucket_docs' into 'master'	Douwe Maan	2015-06-05	1	-18/+36
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve BitBucket integration documentation [ci skip] This MR will improve the BitBucket integration documentation by - mentioning the need to reconfigure GitLab after changing the configuration file, if you're using the omnibus package. - adding a section about configuring a Host entry for bitbucket.org. - switching additional steps 1 and 2, because connecting to BitBucket will only work after you added the SSH key and the Host entry. - using sudo for the ssh connection in step 2, so that it is more obvious, that the git account should be used to establish the connection. See merge request !670
\| \| \| * \|	Improve BitBucket integration documentation [ci skip]	Patrick Fey	2015-05-15	1	-18/+36
\| \| \| \| \|
* \| \| \| \|	Make unicorn docs discoverable	Jacob Vosmaer	2015-06-05	1	-0/+1
\|/ / / /
* \| \| \|	Merge branch 'understanding-unicorn' into 'master'	Job van der Voort	2015-06-05	1	-0/+86
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Try to explain Unicorn and unicorn-worker-killer See merge request !1842
\| * \| \|	Try to explain Unicorn and unicorn-worker-killer	Jacob Vosmaer	2015-06-05	1	-0/+86
\|/ / /
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-05	3	-2/+4
\|\ \ \
\| * \ \	Merge branch 'maser/gitlab-ce-order-commit-comments-in-api' into 'master'	Dmitriy Zaporozhets	2015-06-05	3	-2/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Order commit comments in API chronologically When fetching commit comments via API, the comments were not ordered, but just returned in the order Postgresql finds them. Now the API always returns comments in chronological order. Same as !628 but with CI See merge request !768
\| \| * \| \|	Order commit comments in API chronologically	Martin Luder	2015-05-08	3	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When fetching commit comments via API, the comments were not ordered, but just returned in the order Postgresql finds them. Now the API always returns comments in chronological order.