home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,504 Commits 48 Branches 340 Tags
ad0f1276dbfffadb18fa28980fb4bca91dbc19b9
Commit Graph
901 Commits
Author SHA1 Message Date
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
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
Dmitriy Zaporozhets 56ddf93f8e Merge pull request #4101 from bassrock/master 
Update suggestion for Check.rake
 2013-05-29 23:24:56 -07:00
Drew Blessing 07fd95f384 Update api docs and remove old attribute from User entity. 
The API docs incorrectly referenced a few attributes associated with users. The 'blocked' attribute has been replaced with 'state'. Also, 'dark_scheme' seems to no longer be available in the User model so it should be removed from the exposed attributes in the API User entity.

Add color scheme ID to API User entity
 2013-05-29 05:40:17 -05:00
Dmitriy Zaporozhets 6e96120337 Merge pull request #4098 from pguridi/jira 
Jira - Fixed Jira Issue tracker support
 2013-05-29 03:20:13 -07:00
Dmitriy Zaporozhets df67b25bc2 init.d: Ensure socket is removed before starting service 2013-05-28 17:09:01 +03:00
Pedro GuridiandPedro Guridi 5ec3129ea6 Changed regex to support Jira issue numbering format 
Jira issues numbering format are like: "PROJECT-1234".
Changed the regular expression to support Jira issues linking, in addition to the normal #123.

Added Jira Issue tracker configuration example
 2013-05-27 16:51:37 -03:00
bassrock 3db67ff09c Update check.rake 2013-05-27 13:30:54 -06:00
Dmitriy Zaporozhets 8b64df58b9 Merge pull request #4067 from bbodenmiller/patch-5 
add code comment about backing up folder when restoring
 2013-05-27 08:26:51 -07:00
Dmitriy Zaporozhets 9351a295c1 Up grape version. Fix issue with raw content being escaped 2013-05-27 17:14:47 +03:00
Dmitriy Zaporozhets ec1055076c Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team 
Conflicts:
	config/gitlab.yml.example
 2013-05-27 15:17:06 +03:00
Dmitriy Zaporozhets c3ba0ee64b Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq into former03-feature_teams_api 
Conflicts:
	doc/api/README.md
 2013-05-27 15:05:01 +03:00
Ben Bodenmiller d0b04b03b4 clarify restore 2013-05-27 04:35:54 -07:00
James E. Flemer 5f9d78fdff Include groups in import with import repos rake task 
Expand the import glob to include `**/*.git` to find projects in groups
as well as top level projects.  Check for existing group, and create
group if needed.  Set namespace_id for imported projects.
 2013-05-25 11:38:55 -06:00
Dmitriy Zaporozhets 63c6f30aba Fix ldap auth for http push 2013-05-24 20:36:28 +03:00
Dmitriy Zaporozhets 76ffd11684 Merge pull request #3964 from mhfan/improve-sidekiq-check 
improve regrex for match(sidekiq) robustness
 2013-05-23 02:27:34 -07:00
Dmitriy Zaporozhets 068cf2f467 split repositories and projects api 2013-05-23 12:23:47 +03:00
Christian Simon 0ebfa5e5a2 [FEATURE] Basic user_teams api 
* Closing #3066
 * Closing #3609
 2013-05-21 23:13:30 +02:00
Ben Bodenmiller de29a424e6 changed Gitlab to GitLab 2013-05-19 02:13:39 -07:00
Dmitry Medvinsky 22279bc558 Add settings for user permission defaults 
“Can create groups” and “Can create teams” had hardcoded defaults to
`true`. Sometimes it is desirable to prohibit these for newly created
users by default.
 2013-05-16 18:02:22 +04:00
Dmitriy Zaporozhets 31f007f79f Fix skipping of some elements in makrdown 2013-05-16 12:54:10 +03:00