home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,672 Commits 48 Branches 340 Tags
d938486c3607dde357bf10f2d31b204290cdfd3f
Commit Graph
920 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 8cdfa86b57 Merge pull request #3993 from bke-drewb/3599 
Issue 3599: Add snippets_enabled flag to projects for API
 2013-07-11 09:54:15 -07:00
Dmitriy Zaporozhets 7740005b76 Merge pull request #4264 from andrewwutw/fix-postgresql-restore 
Fix PostgreSQL database restoration problem (#4217)
 2013-07-11 09:52:43 -07:00
Dmitriy Zaporozhets 79a989fa0f Merge pull request #4398 from Razer6/remove_gitolite_check 
Remove gitolite repo check for import script
 2013-07-11 09:23:21 -07:00
Dmitriy Zaporozhets 1de30b9120 Merge pull request #4502 from wuwx/patch-1 
fix bug when project named: mediawiki
 2013-07-11 09:21:53 -07:00
Dmitriy Zaporozhets 381638b77f Merge pull request #4510 from Razer6/fix_not_found_lexers 
Fix Pygments 500 error if lexer not found by name
 2013-07-10 03:58:41 -07:00
Angus MacArthur ea5a006f27 Additon of apis for fork administration. 
Added ability to add and remove the forked from/to relatioinship
between existing repos.
 2013-07-08 17:34:00 -04:00
Robert Schilling db325ef940 Fix Pygments 500 error if lexer not found by name. Use first alias instead. fixes #4473, #4451 2013-07-07 19:00:07 +02:00
wuweixin 2c7b0d5a46 fix bug when project named: mediawiki 
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
 2013-07-06 09:31:56 +08:00
Robert Schilling 702dc30448 Add 'services' to path blacklist, fixes #4470 2013-07-03 12:57:35 +02:00
Robert Schilling c6464aa859 Remove gitolite repo check for import script 2013-06-23 19:00:10 +02:00
Sytse Sijbrandij 76f2e065ea Merge branch 'master' into install-guide-improvements 
Conflicts:
	doc/install/installation.md
 2013-06-21 21:18:20 +02:00
Dmitriy Zaporozhets b4e8fea274 Refactor grack auth module. Add git over http wiki support 2013-06-14 14:42:55 +03:00
Sytse Sijbrandij f01d482427 Make the installation guide easier to follow for non-unix people. 2013-06-12 21:30:36 +02:00
Sytse Sijbrandij 70e80d95a7 When stopped correctly there should be no warning about a missing socket file. 2013-06-12 21:30:13 +02:00
Dmitriy Zaporozhets 995e656add Add path blacklist 2013-06-12 22:11:35 +03:00
Dmitriy Zaporozhets 8f52501eb5 Fix inline diff issue. See #3150 2013-06-12 16:43:58 +03:00
Drew Blessing 31b06ebd01 Issue 3599: Add snippets_enabled flag to projects for API 
s 3599: Add snippets_enabled flag to projects for API

Replace missing comma
 2013-06-11 21:38:02 -05:00
Dmitriy Zaporozhets 993af5d0d2 cattr_accessor is not threadsafe! 2013-06-11 18:15:18 +03:00
Dmitriy Zaporozhets 5cd988249f Merge pull request #4140 from amacarthur/restore-fixes-clean 
fixes for gitlab restore with non-standard backup and repo dirs
 2013-06-11 02:12:06 -07:00
Dmitriy Zaporozhets 9a0e7c0e85 Merge pull request #4224 from hiroponz/fix-abort-gitlab-app-check 
Fix abort gitlab:app:check
 2013-06-11 01:48:18 -07:00
andrewwutw b898372154 Fix PostgreSQL database restoration problem (#4217) 
Use psql instead of pg_restore to restore SQL dump file.
 2013-06-10 19:06:12 +08:00
Dmitriy Zaporozhets 2ab782ae37 Merge pull request #4260 from dosire/pygments-name 
Fix pygment lexer 500 errors when an alias is used instead of a name.
 2013-06-09 22:54:20 -07:00
Sytse Sijbrandij 409b0a0ab5 Fix pygment lexer 500 errors when an alias is used instead of a name. 2013-06-09 21:30:20 +02:00
Dmitriy Zaporozhets 8df699a336 API: project events 2013-06-06 19:19:17 +03:00
Dmitriy Zaporozhets 543506f3c5 API: Add last_activity_at date to project entity 2013-06-06 18:40:05 +03:00
Dmitriy Zaporozhets 36777f4ad3 Merge pull request #4204 from axilleas/initd_check-fix 
Read init script recipe from Rails.root path. Fix #4174
 2013-06-06 08:20:58 -07:00
Dmitriy Zaporozhets da6f4f06c7 API: implement retrieve of repository tree 2013-06-06 18:01:03 +03:00
Dmitriy Zaporozhets cf9a366e22 API: Fix repository commits pagination 2013-06-06 16:16:49 +03:00
Dmitriy Zaporozhets 883f465abe Fix snippet raw content being escaped 2013-06-06 16:10:24 +03:00
Dmitriy Zaporozhets b05600f28b Split Project api on several parts: deploy_keys, hooks, snippets etc 2013-06-06 12:37:51 +03:00
Dmitriy Zaporozhets 963f475daf Fix milestone api docs: invalid param for close 2013-06-06 12:32:05 +03:00
Dmitriy Zaporozhets a4e671dc31 Fix wrong documentation for issue close api. Fixes #3548 2013-06-06 11:31:40 +03:00
Dmitriy Zaporozhets 0fbaf95f13 Merge pull request #4155 from babatakao/selectable_master_project_deploy_keys 
Selectable deploy keys contain master projects
 2013-06-05 23:05:58 -07:00
Sato Hiroyuki c18564d2cb Fix abort gitlab:app:check 
When the file that pointed git bin_path in gitlab.yml dose'nt exist,
bundle rake gitlab:app:check would be aborted.

refs #4205
 2013-06-06 10:10:51 +09:00
Sytse Sijbrandij 89d6ee1632 This commit got lost https://github.com/gitlabhq/gitlab-recipes/commit/76ba45246e93e9c764580fe54ccfe38da751afbe 2013-06-05 20:08:42 +02:00
Dmitriy Zaporozhets f1e0d37b15 Its better to load graph with ajax since it requires ~10 seconds for bigger projects to finish up 2013-06-05 15:50:11 +03:00
Karlo Sorianoandkarlo57 71d67e6557 Contributors graphs feature for GitLab 
Created tests and refactored some code along the way

Added stat graph util spec, refactored code

finsihed up tests and refactors

finsihed up tests and refactors
 2013-06-05 16:51:48 +08:00
Axilleas Pipinellis ff7e808043 Read init script recipe from Rails.root path. Fix #4174 
Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
 2013-06-05 01:23:28 +03:00
babatakaoandbaba 37a90d5f76 Selectable deploy keys contain master projects 2013-06-05 02:59:30 +09:00
Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist 
Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb
 2013-06-04 18:36:22 +03:00
Dmitriy Zaporozhets 0611c5c612 Fix deploy key api 500 if key is empty 2013-06-03 21:01:07 +03:00
Dmitriy Zaporozhets 50e8d6c0c0 Add api to collect owned user projects. Api deploy_key.create: Enable deploy key if it exist in other owned project 2013-06-03 19:49:04 +03:00
Angus MacArthur 5f4fea17ad Correction to restore expected current directory 2013-06-03 11:00:24 -04:00
Andrey Kumanyaev 41f88f468a No check access if no relation between user and project 2013-06-01 19:40:20 +04:00
Andrey Kumanyaev 08c2c94d46 Fix bug with team assignation on project from #4109 2013-06-01 19:24:15 +04:00
Angus MacArthur 9c82bca5ee fixes for gitlab restore with non-standard backup and repo dirs 
These fixes will allow a restore of gitlab when the backups and
repositories directories are in non-standard locations (ie sub-dirs
of gitlabhq).  Also allows the restore to be run from script
overriding the need of a user to confirm the rebuild of the
authorized_keys file.
 2013-05-30 09:58:36 -04:00
Dmitriy Zaporozhets 888e493b82 Update membership instead of remove/add if it permissions were changed 2013-05-30 11:40:15 +03:00
Dmitriy Zaporozhets 31fdcac161 UserTeam: Fixed bug when impossible to change admin flag after checked 2013-05-30 11:25:34 +03:00
Dmitriy Zaporozhets 6e5b1686f4 TeamManagement: Dont update permissions if it was not changed 2013-05-30 11:13:38 +03:00
Dmitriy Zaporozhets cd5685ca8c Merge pull request #4115 from bke-drewb/apidocs 
Update api docs and remove old attribute from User entity.
 2013-05-29 23:25:40 -07:00