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

	Commit message (Collapse)	Author	Age	Files	Lines
*	enhance project creation apis to allow setting of public attribute	Angus MacArthur	2013-07-12	4	-3/+39
\| \| \| \|	Change-Id: Ib71ce8cf993627eada63d7d596fb302ec702f36e
*	Ability to leave group from profile area	Dmitriy Zaporozhets	2013-07-12	7	-2/+56
\|
*	Update schema with snippet content size	Dmitriy Zaporozhets	2013-07-12	1	-3/+3
\|
*	Merge branch '6-0-dev' of /home/git/repositories/gitlab/gitlabhq	Dmitriy Zaporozhets	2013-07-12	477	-5052/+2880
\|\
\| *	Merge branch 'master' into 6-0-dev	Dmitriy Zaporozhets	2013-07-12	2	-3/+10
\| \|\ \| \|/ \|/\| \| \| \| \|	Conflicts: VERSION
* \|	5.4.0 is rc1	Dmitriy Zaporozhets	2013-07-12	1	-1/+1
\| \|
* \|	Update CHANGELOG	Dmitriy Zaporozhets	2013-07-12	1	-0/+5
\| \|
* \|	Merge pull request #4324 from axilleas/initd_script	Dmitriy Zaporozhets	2013-07-12	1	-3/+5
\|\ \ \| \| \| \| \| \|	Removal of gitlab.socket should be in stop function too. Fix #4313
\| * \|	Removal of gitlab.socket should be in stop function too. Fix #4313	Axilleas Pipinellis	2013-07-12	1	-3/+5
\| \| \|
\| \| *	Merge branch 'master' into 6-0-dev	Dmitriy Zaporozhets	2013-07-12	12	-28/+43
\| \| \|\ \| \|_\|/ \|/\| \|
* \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2013-07-12	1	-1/+1
\|\ \ \
\| * \ \	Merge pull request #4533 from babatakao/patch-2	Yves Senn	2013-07-12	1	-1/+1
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Fix typo.
\| \| * \|	Fix typo.	Takao Baba	2013-07-12	1	-1/+1
\| \|/ /
* \| \|	Fix issues 500 if milestone id exists but milestone is not	Dmitriy Zaporozhets	2013-07-12	1	-1/+1
\|/ /
* \|	Merge pull request #3993 from bke-drewb/3599	Dmitriy Zaporozhets	2013-07-11	3	-19/+27
\|\ \ \| \| \| \| \| \|	Issue 3599: Add snippets_enabled flag to projects for API
\| * \|	Issue 3599: Add snippets_enabled flag to projects for API	Drew Blessing	2013-06-11	3	-18/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	s 3599: Add snippets_enabled flag to projects for API Replace missing comma
* \| \|	Merge pull request #4264 from andrewwutw/fix-postgresql-restore	Dmitriy Zaporozhets	2013-07-11	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Fix PostgreSQL database restoration problem (#4217)
\| * \| \|	Fix PostgreSQL database restoration problem (#4217)	andrewwutw	2013-06-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Use psql instead of pg_restore to restore SQL dump file.
* \| \| \|	Merge pull request #4282 from bke-drewb/3904	Dmitriy Zaporozhets	2013-07-11	1	-0/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Increase snippet content column size.
\| * \| \| \|	Increase snippet content column size.	Drew Blessing	2013-06-11	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will fix issue #3904
* \| \| \| \|	Merge pull request #4297 from jdurand/patch-1	Dmitriy Zaporozhets	2013-07-11	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update api.js.coffee
\| * \| \| \| \|	Update api.js.coffee	Jim	2013-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CoffeeScript doesn't like that
* \| \| \| \| \|	Merge pull request #4353 from dirker/allow-import-via-git-protocol	Dmitriy Zaporozhets	2013-07-11	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	project: allow import via git:// url
\| * \| \| \| \| \|	project: allow import via git:// url	Dirk Hörner	2013-06-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Besides specifying http and https url's as the import-url when creating a new project, you can now use git://... url's to import via the git protocol.
* \| \| \| \| \| \|	Merge pull request #4398 from Razer6/remove_gitolite_check	Dmitriy Zaporozhets	2013-07-11	1	-2/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove gitolite repo check for import script
\| * \| \| \| \| \| \|	Remove gitolite repo check for import script	Robert Schilling	2013-06-23	1	-2/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4502 from wuwx/patch-1	Dmitriy Zaporozhets	2013-07-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix bug when project named: mediawiki
\| * \| \| \| \| \| \| \|	fix bug when project named: mediawiki	wuweixin	2013-07-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mediawiki.wiki.git mediawiki.git /.wiki$/ match awiki, so when your project named mediawiki it will be find project named: "medi" use /\.wiki$/ fix this bug
* \| \| \| \| \| \| \| \|	Merge pull request #4528 from akiva/master	Dmitriy Zaporozhets	2013-07-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow SSH keys to be of type ecdsa rather than only rsa and dsa (which are slower, older, and weaker)
\| * \| \| \| \| \| \| \| \|	Allow ecdsa SSH keys	Akiva Levy	2013-07-10	1	-1/+1
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update app/models/key.rb to permit SSH keys of type ecdsa rather than forcing dsa and rsa algorithms.
* \| \| \| \| \| \| \| \|	Remove randomly failing test	Dmitriy Zaporozhets	2013-07-10	1	-6/+0
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| *	Open note image attachment in new tab	Dmitriy Zaporozhets	2013-07-11	2	-4/+6
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| *	Fix multiple trigger on button attachment	Dmitriy Zaporozhets	2013-07-10	1	-0/+6
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| *	Remove randomly failing test	Dmitriy Zaporozhets	2013-07-10	1	-6/+0
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| *	Merge branch 'master' into 6-0-dev	Dmitriy Zaporozhets	2013-07-10	10	-23/+181
\| \| \| \| \| \| \| \| \|\ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: CHANGELOG VERSION app/views/admin/teams/projects/new.html.haml app/views/projects/teams/available.html.haml doc/install/installation.md
* \| \| \| \| \| \| \| \|	Merge pull request #4510 from Razer6/fix_not_found_lexers	Dmitriy Zaporozhets	2013-07-10	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Pygments 500 error if lexer not found by name
\| * \| \| \| \| \| \| \| \|	Fix Pygments 500 error if lexer not found by name. Use first alias instead. ↵	Robert Schilling	2013-07-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #4473, #4451
* \| \| \| \| \| \| \| \| \|	Merge pull request #4511 from yuters/patch-3	Dmitriy Zaporozhets	2013-07-10	1	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UI : navbar tooltip position fix when "loading" appears.
\| * \| \| \| \| \| \| \| \| \|	navbar tooltip position fix when "loading" appears.	Martin Bastien	2013-07-07	1	-0/+11
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #4515 from amacarthur/fork-admin	Dmitriy Zaporozhets	2013-07-10	5	-3/+138
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Additon of apis for fork administration.
\| * \| \| \| \| \| \| \| \| \|	Additon of apis for fork administration.	Angus MacArthur	2013-07-08	5	-3/+138
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added ability to add and remove the forked from/to relatioinship between existing repos.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2013-07-10	3	-10/+12
\|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge pull request #4519 from kwongius/team-assignment-text	Yves Senn	2013-07-09	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix header text for setting greatest team access to a project
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix header text for setting greatest team access to a project	Kevin Wong	2013-07-09	2	-2/+2
\| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'change-to-default-installer' of ↵	Dmitriy Zaporozhets	2013-07-08	1	-8/+10
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	/home/git/repositories/gitlab/gitlabhq
\| \| * \| \| \| \| \| \| \| \| \|	Use default system editor.	Sytse Sijbrandij	2013-07-08	1	-8/+10
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Sanitize user attrs on model level	Dmitriy Zaporozhets	2013-07-10	4	-14/+15
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Added new entries to changelog. Version up to 5.4.0.pre	Dmitriy Zaporozhets	2013-07-08	2	-1/+11
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #4508 from Razer6/fix_broken_api_links	Dmitriy Zaporozhets	2013-07-08	1	-12/+12
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken API links, fixes #4463
\| * \| \| \| \| \| \| \| \| \|	Fix broken API links, fixes #4463	Robert Schilling	2013-07-07	1	-12/+12
\| \| \| \| \| \| \| \| \| \| \|