home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,969 Commits 48 Branches 340 Tags
a28bc409fcedfbd668ab9be725b451d5c02ba5cb
Commit Graph
260 Commits
Author SHA1 Message Date
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Jacob Vosmaer aa0473d0eb Validate fingerprint uniqueness 2013-07-17 15:17:18 +02:00
Jacob Vosmaer 3ada8f45c7 Remove unnecessary user from test 2013-07-17 15:17:17 +02:00
Dmitriy Zaporozhets 21f7c99c25 group add_users spec 2013-06-26 15:32:09 +03:00
Dmitriy Zaporozhets 7b87fcbad4 Fix broken factory 2013-06-22 16:46:57 +03:00
Dmitriy Zaporozhets 0bc714c271 Remove form for adding user to several projects from admin area. 
Remove unnecessary projects order on User#show
 2013-06-22 13:41:08 +03:00
Dmitriy Zaporozhets 8c918e583a Remove tests for missing method 2013-06-21 21:50:34 +03:00
Dmitriy Zaporozhets 6e35aceff2 Annotated 2013-06-19 15:40:33 +03:00
Dmitriy Zaporozhets 1b3b90dbfd Remove teams specs 2013-06-18 22:06:20 +03:00
Dmitriy Zaporozhets 439f399bec Remove all team resources except models. Move models to deprecated directory 2013-06-18 21:22:34 +03:00
Dmitriy Zaporozhets b4fe5a76a7 Fix UsersGroup specs 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets fa877b6312 UsersGroup specs. Fixed db/schema 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets 81697850eb create UsersGroup entity. Modify ability to check group owners instead one owner 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets 993af5d0d2 cattr_accessor is not threadsafe! 2013-06-11 18:15:18 +03:00
Dmitriy Zaporozhets 470f9064fa Merge pull request #4206 from babatakao/authorize_all_teams_to_admin 
Authorize all teams to admin: fix 500 error on showing team page.
 2013-06-06 07:14:50 -07:00
babatakao 86a262de1a Authorize all teams to admin: fix 500 error on showing team page. 
500 error was occured in the following steps:

1. user1 creates new team "team1".
2. Assign team1 to project1.
3. Sign in as admin. This admin is not a member of team1.
4. Open project1 team setting page (/project1/team).
5. Click "team1" link in "Assigned teams" area.
6. 500 error.

Fixed this issue.
 2013-06-05 15:41:33 +09: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 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 bbaa0fccfa Update poltergeist and should-matchers 2013-05-23 11:54:44 +03: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 af5d0e9e92 Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashes 
Code cleanup: Replace old hashes and remove trailing spaces
 2013-05-07 06:59:03 -07:00
Dmitriy Zaporozhets 4528fa9817 modify api to work with new deploy keys 2013-05-06 16:24:58 +03:00
Dmitriy Zaporozhets 42b86b79d0 Model specs for DeployKeys 2013-05-06 15:09:26 +03:00
Andrey Kumanyaev b1b354b0f8 remove trailing spaces 2013-05-05 18:02:02 +04:00
Dmitriy Zaporozhets f40d4e6685 Merge pull request #3597 from amacarthur/fork-pull-request 
updated fork feature to use gitlab-shell for v5 of gitlab
 2013-05-02 23:41:07 -07:00
Dmitriy Zaporozhets 615e496846 change user_spec to pass postgres 2013-04-15 16:30:26 +03:00
Angus MacArthur ae33fdf297 updated fork feature to use gitlab-shell for v5 of gitlab 2013-04-15 01:54:52 -04:00
Dmitriy Zaporozhets 001f3bc59e Specs refactoring to reduce test time. Disabled observers by default for specs 2013-04-10 23:28:42 +03:00
Dmitriy Zaporozhets 0ae892007d Remove Wiki and db table since we use gollum now 2013-04-10 22:20:00 +03:00
Dmitriy Zaporozhets 4fcd89fe7f Fixed random failing test 2013-04-10 18:26:25 +03:00
Dmitriy Zaporozhets 0f2798d498 Merge branch 'feature/refactoring_scopes_pr' of https://github.com/Undev/gitlabhq into Undev-feature/refactoring_scopes_pr 
Conflicts:
	db/schema.rb
 2013-04-09 20:37:04 +03:00
Dmitriy Zaporozhets 25856a47e5 save each notification setting with ajax on change 2013-04-04 22:11:51 +03:00
Dmitriy Zaporozhets dfeef6c228 Fixed API file raw functionality, Fixed tree controller tests. Added BlobController specs 2013-04-03 15:55:08 +03:00
Andrey Kumanyaev 85e039049c Fix tests 2013-04-03 07:06:18 +04:00
Dmitriy Zaporozhets 9a26e9a0d6 Dont init repo on every create(:repo) 2013-04-01 17:27:44 +03:00
Dmitriy Zaporozhets 541d899410 Project.repository should never be nil so you can call repository.exists? or repository.empty? 
Also specify separate project factory for project with filled repo
 2013-04-01 16:56:25 +03:00
Dmitriy Zaporozhets 9dc644635f Fix tests and remove app/models/repository.rb 2013-03-31 18:50:17 +03:00
Dmitriy Zaporozhets 71b0f8ea0b Use existing methods for branch names: Ex use @repository.branch_names instead of @repository.heads.map(&:name) 2013-03-31 17:08:10 +03:00
Dmitriy Zaporozhets 1c5a393c95 Merge pull request #3406 from docwhat/in_projects 
Fixed UsersProject.in_projects
 2013-03-30 15:03:44 -07:00
Dmitriy Zaporozhets 5f14a6bcf8 annotated 2013-03-27 18:26:37 +02:00
Dmitriy Zaporozhets e3f1164248 stub notification in event model 2013-03-26 19:27:39 +02:00
Christian Höltje b8502cbaee Fixed UsersProject.in_projects 
I discovered while trying to use UserTeam#remove_member() that
UsersProject.in_projects was broken.  So I wrote test cases to test what
I was trying to do and fixed the underlying problem.
 2013-03-26 10:19:55 -04:00
Andrew8xx8 03de5a5cee Typo in realtion name fixed 2013-03-25 16:35:57 +04:00
Andrew8xx8 d4543eb5a7 Tests fixed 2013-03-25 11:20:14 +04:00
Andrew8xx8 9e2525cbd0 Association form user to snippets added 2013-03-24 23:09:59 +04:00
Andrew8xx8 bc7c5f87bb Project snippet moved to separate model 2013-03-24 19:26:49 +04:00
Dmitriy Zaporozhets c4299bb45a Move directory logic out of model. Use Gitlab:Shell class to interact with file system 2013-03-21 22:11:08 +02:00
Dmitriy Zaporozhets 71ab011a17 Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis 
Conflicts:
	app/views/layouts/project_resource.html.haml
	app/views/wikis/edit.html.haml
	app/views/wikis/pages.html.haml
	app/views/wikis/show.html.haml
	spec/features/gitlab_flavored_markdown_spec.rb
 2013-03-15 16:55:07 +02:00
Dmitriy Zaporozhets 21b1fee92c reannotated 2013-03-15 15:16:02 +02:00