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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Store commit count in project tableadvanced-cache	Dmitriy Zaporozhets	2015-07-17	11	-19/+37
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Build missing cache items in background job after each push	Dmitriy Zaporozhets	2015-07-17	5	-5/+38
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Add more seed projects. Control amount with SIZE env variable	Dmitriy Zaporozhets	2015-07-17	1	-1/+34
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-07-17	2	-34/+38
\|\
\| *	Clean up editions paragraph	Sytse Sijbrandij	2015-07-17	1	-4/+5
\| \|
\| *	Update installation instructions.	Sytse Sijbrandij	2015-07-17	1	-1/+3
\| \|
\| *	Improve the layout of the readme.	Sytse Sijbrandij	2015-07-17	1	-18/+22
\| \|
\| *	Merge branch 'chef-docker' into 'master'	Job van der Voort	2015-07-16	1	-0/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added note about chef Added note about chef being required to generate GitLab config. because of tweet https://twitter.com/grahamgilbert/status/621015318442459136 See merge request !982
\| \| *	added additional spacechef-docker	karen Carias	2015-07-15	1	-0/+1
\| \| \|
\| \| *	added note about chef	karen Carias	2015-07-15	1	-0/+1
\| \| \|
\| * \|	Merge branch 'improve-readme' into 'master'	Sytse Sijbrandij	2015-07-16	1	-12/+7
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document should start from h1 title. Also put badges on top for easier tracking Looks much better with new project page design. See merge request !983
\| \| * \|	Document should start from h1 title. Also put badges on top for easier trackingimprove-readme	Dmitriy Zaporozhets	2015-07-16	1	-12/+7
\| \|/ /
* \| \|	Merge branch 'create-branch' into 'master'	Job van der Voort	2015-07-16	7	-66/+100
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added new doc about creating a new branch Added new document about creating a branch and fixed bullets in all the other documents. Also fixed "git push REMOTE BRANCH". See merge request !1894
\| * \|	fixed conflict	karen Carias	2015-07-16	107	-242/+1079
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2015-07-16	2	-2/+6
\|\ \ \
\| * \ \	Merge branch 'merge-request-wip-information' into 'master'	Stan Hu	2015-07-15	2	-2/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	api: expose work_in_progress flag See merge request !948
\| \| * \| \|	api: expose work_in_progress flag	Ben Boeckel	2015-07-10	2	-2/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Marin Jankovski	2015-07-16	3	-9/+8
\|\ \ \ \ \
\| * \ \ \ \	Merge pull request #9455 from rburchell/patch-1	Stan Hu	2015-07-14	1	-8/+0
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|	Remove author information from "post" in merge_requests API.
\| \| * \| \| \|	Remove author information from "post" in merge_requests API.	Robin Burchell	2015-07-13	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From both experimenting with the API and reading the source code, this appears to not be used at all. My guess is this was copypasta from somewhere else.
\| * \| \| \| \|	Merge branch 'docker-image' into 'master'	Kamil Trzciński	2015-07-14	2	-1/+8
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix docker image See merge request !979
\| \| * \| \| \| \|	Fix docker imagedocker-image	Kamil Trzcinski	2015-07-14	2	-1/+8
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'time_ago_fix' into 'master'	Dmitriy Zaporozhets	2015-07-15	2	-0/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Time ago fix for branch compare page https://dev.gitlab.org/gitlab/gitlabhq/issues/2508 See merge request !1904
\| * \| \| \| \|	Time ago fix for compare page	Valery Sizov	2015-07-15	2	-0/+2
\|/ / / / /
* \| \| \| \|	Revert password change changelog entry.	Sytse Sijbrandij	2015-07-14	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Revert "Change default admin password from "5iveL!fe" to "password""	Sytse Sijbrandij	2015-07-14	5	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 8a01a1222875b190d32769f7a6e7a74720079d2a.
* \| \| \| \|	Merge branch 'notifications-title' into 'master'	Job van der Voort	2015-07-14	2	-5/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed notifications title I fixed the title and link to this document because I believe that it's more clear and easier to find if it has "emails" in the name. See merge request !1897
\| * \| \| \| \|	fixed notifications title	karen Carias	2015-07-13	2	-5/+3
\| \|/ / / /
* \| \| \| \|	Merge branch 'fix-ed' into 'master'	Dmitriy Zaporozhets	2015-07-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix path to move_drop_indexes.ed Small documentation fix. See merge request !1900
\| * \| \| \| \|	Fix path to move_drop_indexes.ed	Jacob Vosmaer	2015-07-14	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-07-14	5	-3/+124
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'nice-scroll-sidebar' into 'master'	Dmitriy Zaporozhets	2015-07-14	4	-2/+122
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add nice scroll for sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !978
\| \| * \| \| \| \| \|	Add nice scroll for sidebar	Dmitriy Zaporozhets	2015-07-14	4	-2/+122
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Merge branch 'scrollbar-issue' into 'master'	Dmitriy Zaporozhets	2015-07-14	1	-1/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide scrollbar from sidebar when external mouse is connected to OSX See merge request !977
\| \| * \| \| \| \|	Hide scrollbar from sidebar when external mouse is connected to OSX	Kamil Trzcinski	2015-07-14	1	-1/+2
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'update-guide-713' into 'master'	Valery Sizov	2015-07-14	2	-11/+140
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	create update guides for 7.13 See merge request !1899
\| * \| \| \| \|	create update guides for 7.13	Job van der Voort	2015-07-14	2	-11/+140
\|/ / / / /
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-07-14	2	-8/+11
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'rs-fix-coverage' into 'master'	Dmitriy Zaporozhets	2015-07-14	2	-8/+11
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move coverage-related setup back to spec_helper These tools must be loaded before our regular Rails environment. Partially reverts 57830201a9152b56ccf65a98275601617f44653d See merge request !976
\| \| * \| \| \| \|	Move coverage-related setup back to spec_helperrs-fix-coverage	Robert Speicher	2015-07-13	2	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These tools must be loaded before our regular Rails environment.
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-07-14	6	-18/+81
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'rs-issue-1773' into 'master'	Dmitriy Zaporozhets	2015-07-14	6	-18/+81
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mentions not being created upon issue/merge request update New cross-references weren't being added when they were made in an issue or merge request update. This happened because the relevant `UpdateService`s were making the `notice_added_references` call after the model had already been updated and saved, so the `changes` attribute was empty and no cross-references were made at all. This fixes the bug and adds a bit of testing and a bit of refactoring. Closes #1773 See merge request !974
\| \| * \| \| \| \| \|	Rename `notice_added_references` to `create_new_cross_references!`rs-issue-1773	Robert Speicher	2015-07-13	6	-12/+12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Refactor Mentionable#notice_added_references	Robert Speicher	2015-07-13	2	-11/+74
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It now accounts for models that have changed but have already been persisted, such as when called from an UpdateService. Closes #1773
* \| \| \| \| \| \|	Merge branch 'mysql-to-postgres-ed' into 'master'	Dmitriy Zaporozhets	2015-07-14	1	-0/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 'ed' step to mysql-to-postgres procedure This change brings the documentation in this repo up to date with that in https://github.com/gitlabhq/mysql-postgresql-converter . See merge request !1896
\| * \| \| \| \| \|	Add 'ed' step to mysql-to-postgres procedure	Jacob Vosmaer	2015-07-13	1	-0/+2
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduced in https://github.com/gitlabhq/mysql-postgresql-converter/commit/b2d1599706f532e1bac836243f25e005c816ef14
* \| \| \| \| \|	Merge branch 'project-default-view' into 'master'	Dmitriy Zaporozhets	2015-07-14	13	-39/+82
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow user to specify content he wants to see on project page Improvement to !938. Since a lot of people complain on fact they don't like to see README. Especially since we already have a switcher for dashboard - it kind of acceptable to select behaviour. User can specify which content he/she wants to see: ![Screenshot_2015-07-13_18.24.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d237474e8f52df4a62ba7e951fa28bd8/Screenshot_2015-07-13_18.24.31.png) ![Screenshot_2015-07-13_18.24.36](https://gitlab.com/gitlab-org/gitlab-ce/uploads/473b0e2a94b3de16d048b8332b539816/Screenshot_2015-07-13_18.24.36.png) cc @JobV @jacobvosmaer @marin @sytses See merge request !970
\| * \| \| \| \| \|	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 'project-plus-icon' into 'master'	Dmitriy Zaporozhets	2015-07-13	2	-3/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaced icon for project page dropdown button Improve for !971 ![Screenshot_2015-07-13_23.37.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2b168c6f8a07f33cab4ca8f735646f8a/Screenshot_2015-07-13_23.37.01.png) See merge request !973
\| * \| \| \| \| \|	Improve project new item dropdownproject-plus-icon	Dmitriy Zaporozhets	2015-07-13	2	-3/+2
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>