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

	Commit message (Collapse)	Author	Age	Files	Lines
*	added note about chef	karen Carias	2015-07-15	1	-0/+1
\|
*	information about why we use fig.yml	karen Carias	2015-07-10	1	-3/+5
\|
*	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>
\| * \|	Merge branch 'fork_visibility_level' into 'master'	Dmitriy Zaporozhets	2015-07-10	8	-1/+106
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	8	-1/+106
\| \| \| \|
\| * \| \|	Merge branch 'hierarchical-navigation'	Dmitriy Zaporozhets	2015-07-10	8	-1/+64
\| \|\ \ \
\| \| * \| \|	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	8	-0/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2015-07-10	2	-6/+3
\| \|\ \ \
\| * \ \ \	Merge branch 'comment-box-changes' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-07-10	5	-7/+13
\| \|\ \ \ \
\| \| * \| \| \|	Fixed the issuescomment-box-changes	Darby	2015-07-09	4	-3/+5
\| \| \| \| \| \|
\| \| * \| \| \|	Comment box/Placeholder text redo	Darby	2015-07-01	5	-7/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Add volumes to marathon file.	Sytse Sijbrandij	2015-07-10	1	-1/+18
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Revert "Remove intro and link to Dockerhub"	Sytse Sijbrandij	2015-07-10	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 57ec2832875aa976950093479b6a69f4e852807c.
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Sytse Sijbrandij	2015-07-10	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Remove intro and link to Dockerhub	Sytse Sijbrandij	2015-07-10	1	-1/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Remove intro and link to Dockerhub	Sytse Sijbrandij	2015-07-10	1	-5/+2
\| \|/ / / /
* \| \| \| \|	Merge branch 'readme-ci-com-badge' into 'master'	Dmitriy Zaporozhets	2015-07-10	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Point to ci.gitlab.com badge in README See merge request !1893
\| * \| \| \|	Point to ci.gitlab.com badge in README	Dmitriy Zaporozhets	2015-07-09	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-update-coveralls' into 'master'	Dmitriy Zaporozhets	2015-07-10	2	-12/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump coveralls version, remove explicit rest-client dependency coveralls got updated, so we don't need the rest-client entry in the Gemfile anymore. See merge request !951
\| * \| \| \| \|	Bump coveralls version, remove explicit rest-client dependencyrs-update-coveralls	Robert Speicher	2015-07-09	2	-12/+5
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'rs-issue-1939' into 'master'	Marin Jankovski	2015-07-10	2	-1/+17
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor style fixes ### Reset ul list style types inside notes Because notes are themselves `ul`s, lists inside of notes started at the wrong depth, so this resets that. Closes #259 --- ### Style all blockquote children, not just p Makes styling of non-paragraph text, such as lists, inside blockquotes consistent. Closes #1939 See merge request !949
\| * \| \| \|	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 'revert-note-query-information' into 'master'	Stan Hu	2015-07-09	2	-11/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries" This reverts commit dd4fee5fdbda07fbc09234c4b043c3c9939a6a9b. See merge request !950
\| * \| \|	Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries"	Stan Hu	2015-07-09	2	-11/+2
\|/ / / \| \| \| \| \| \| \| \| \|	This reverts commit dd4fee5fdbda07fbc09234c4b043c3c9939a6a9b.
* \| \|	Merge branch 'note-query-information' into 'master'	Stan Hu	2015-07-09	2	-2/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note query information The 'editable' field is required to be able to distinguish system-created notes from user comments. The 'upvote' and 'downvote' fields are so that endpoints don't need to duplicate GitLab's logic for what an up or downvote is. See merge request !677
\| * \| \|	api: add 'system', 'upvote', and 'downvote' fields to note queries	Ben Boeckel	2015-07-09	2	-2/+11
\|/ / /
* \| \|	Merge branch 'docker-single' into 'master'	Kamil Trzciński	2015-07-09	11	-232/+131
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docker documentation to use only one docker container I updated documentation to use only one docker container with manually specified path to the persistent data. The container is named `gitlab` and the image will be put in GitLab organisation: https://registry.hub.docker.com/u/gitlab/gitlab-ce/ - [x] Add VOLUMEs to Dockerfile - [x] Removed all other Dockerfiles (moved everything from docker/single/ to docker/) - [x] Create DockerHub repository for GitLab CE - [x] Reword README to use single image - [x] Push images (manually) to the repository - [ ] Push to GitHub - [ ] Enable Automated Build - [ ] Integrate tagging and pushing of the image with GitLab CI @JobV @sytses Please review. See merge request !909
\| * \| \|	Markdown fixdocker-single	Kamil Trzcinski	2015-07-07	1	-1/+1
\| \| \| \|
\| * \| \|	Add note about HTTPS	Kamil Trzcinski	2015-07-07	1	-0/+2
\| \| \| \|
\| * \| \|	Fix port issue	Kamil Trzcinski	2015-07-07	1	-1/+1
\| \| \| \|
\| * \| \|	Fix port 80443 => 8443	Kamil Trzcinski	2015-07-06	1	-1/+1
\| \| \| \|
\| * \| \|	Final touches	Kamil Trzcinski	2015-07-06	1	-12/+12
\| \| \| \|
\| * \| \|	Update Docker documentation to use single container	Kamil Trzcinski	2015-07-06	11	-231/+125
\| \| \| \|
\| * \| \|	Added data volumes to Dockerfile	Kamil Trzcinski	2015-07-06	1	-2/+5
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-07-09	2	-1/+6
\|\ \ \
\| * \ \	Merge branch 'cache-readme' into 'master'	Dmitriy Zaporozhets	2015-07-09	2	-1/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache readme rendering result Markdown rendering is expensive. Lets cahce result Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !947
\| \| * \| \|	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