OSDN Git Service
Dmitriy Zaporozhets [Tue, 12 Feb 2013 17:02:05 +0000 (19:02 +0200)]
Merge branch 'easy-to-find-commit-on-network-graph' of https://github.com/hiroponz/gitlabhq into hiroponz-easy-to-find-commit-on-network-graph
Dmitriy Zaporozhets [Tue, 12 Feb 2013 16:45:07 +0000 (08:45 -0800)]
Merge pull request #2924 from cdawzrd/patch-2
Disable autocomplete for admin/users form
Dmitriy Zaporozhets [Tue, 12 Feb 2013 10:53:51 +0000 (10:53 +0000)]
Merge branch 'user_delete_account' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 12 Feb 2013 09:50:03 +0000 (01:50 -0800)]
Merge pull request #2965 from yurifury/fix-blob-route
Gitlab incorrectly routes blobs to the compare controller depending on filename.
Dmitriy Zaporozhets [Tue, 12 Feb 2013 09:47:02 +0000 (11:47 +0200)]
Merge branch 'Undev-fix-db-after-updating-rails'
Dmitriy Zaporozhets [Tue, 12 Feb 2013 09:46:50 +0000 (11:46 +0200)]
rename scope to prevent name collision
Dmitriy Zaporozhets [Tue, 12 Feb 2013 09:13:25 +0000 (11:13 +0200)]
Merge branch 'fix-db-after-updating-rails' of https://github.com/Undev/gitlabhq into Undev-fix-db-after-updating-rails
Dmitriy Zaporozhets [Tue, 12 Feb 2013 08:41:21 +0000 (10:41 +0200)]
restore handling exception for project creation
Yuri Feldman [Tue, 12 Feb 2013 08:26:42 +0000 (19:26 +1100)]
Fix for incorrect routing to the Compare controller
Yuri Feldman [Tue, 12 Feb 2013 07:56:53 +0000 (18:56 +1100)]
Test to show incorrect routing to Compare controller
Andrew8xx8 [Tue, 12 Feb 2013 07:16:45 +0000 (11:16 +0400)]
All scopes must be in lambdas
Andrew8xx8 [Tue, 12 Feb 2013 06:54:56 +0000 (10:54 +0400)]
Dynamic values must be in blocks if FG
Dmitriy Zaporozhets [Mon, 11 Feb 2013 21:23:38 +0000 (23:23 +0200)]
Render events for team dashboard
Dmitriy Zaporozhets [Mon, 11 Feb 2013 21:17:34 +0000 (23:17 +0200)]
Rails up to 3.2.12
Dmitriy Zaporozhets [Mon, 11 Feb 2013 21:13:21 +0000 (23:13 +0200)]
Fix project creation without import
Dmitriy Zaporozhets [Mon, 11 Feb 2013 21:00:12 +0000 (23:00 +0200)]
Import repo feature
Dmitriy Zaporozhets [Mon, 11 Feb 2013 18:28:27 +0000 (20:28 +0200)]
fixing tests after refactoring
Dmitriy Zaporozhets [Mon, 11 Feb 2013 17:41:02 +0000 (19:41 +0200)]
add import repo gitlab_shell call
Dmitriy Zaporozhets [Mon, 11 Feb 2013 17:27:26 +0000 (19:27 +0200)]
use proper name for gitlabshell worker
Dmitriy Zaporozhets [Mon, 11 Feb 2013 17:25:06 +0000 (19:25 +0200)]
Fix procfile and attachment in event nore
Dmitriy Zaporozhets [Mon, 11 Feb 2013 17:16:59 +0000 (19:16 +0200)]
No gitolite in project any more
Dmitriy Zaporozhets [Mon, 11 Feb 2013 13:47:01 +0000 (15:47 +0200)]
render note with attachment for event
Marin Jankovski [Mon, 11 Feb 2013 12:12:41 +0000 (13:12 +0100)]
UPdate field name.
Marin Jankovski [Mon, 11 Feb 2013 12:06:37 +0000 (13:06 +0100)]
Test the delete acount option.
Dmitriy Zaporozhets [Mon, 11 Feb 2013 08:14:32 +0000 (10:14 +0200)]
fix attachment uploader for aws
Dmitriy Zaporozhets [Mon, 11 Feb 2013 08:02:52 +0000 (10:02 +0200)]
FIx gitlab:env:info
Dmitriy Zaporozhets [Mon, 11 Feb 2013 07:58:02 +0000 (09:58 +0200)]
Fix gitlab:check
Dmitriy Zaporozhets [Mon, 11 Feb 2013 07:15:42 +0000 (09:15 +0200)]
Since gitlab-shell no sense to check hooks
Dmitriy Zaporozhets [Sat, 9 Feb 2013 13:34:04 +0000 (15:34 +0200)]
removing outdated checks
Dmitriy Zaporozhets [Sat, 9 Feb 2013 13:26:47 +0000 (15:26 +0200)]
ignore docs by git
Dmitriy Zaporozhets [Sat, 9 Feb 2013 13:21:19 +0000 (15:21 +0200)]
cleanup rake tasks since no gitolite required
Dmitriy Zaporozhets [Sat, 9 Feb 2013 13:16:33 +0000 (15:16 +0200)]
show project head for empty project
Dmitriy Zaporozhets [Sat, 9 Feb 2013 13:13:56 +0000 (15:13 +0200)]
Refactored and fixed seeds to work with gitlab-shell
Dmitriy Zaporozhets [Sat, 9 Feb 2013 10:32:24 +0000 (12:32 +0200)]
remove useless warning
Dmitriy Zaporozhets [Sat, 9 Feb 2013 10:30:49 +0000 (12:30 +0200)]
task to build missing projects with gitlab-shell
Dmitriy Zaporozhets [Fri, 8 Feb 2013 06:55:39 +0000 (08:55 +0200)]
GitLab meta to 5.0
Dmitriy Zaporozhets [Fri, 8 Feb 2013 06:41:19 +0000 (22:41 -0800)]
Merge pull request #2936 from jameswritescode/fix_installation_doc_typo
fix the gitlab-shell clone url in master installation doc
James Newton [Thu, 7 Feb 2013 17:53:37 +0000 (11:53 -0600)]
fix the gitlab-shell clone url
Dmitriy Zaporozhets [Thu, 7 Feb 2013 11:20:33 +0000 (13:20 +0200)]
Improve devise views
Dmitriy Zaporozhets [Thu, 7 Feb 2013 11:05:30 +0000 (13:05 +0200)]
It should be 5.0.0pre
Dmitriy Zaporozhets [Thu, 7 Feb 2013 08:26:39 +0000 (08:26 +0000)]
Merge branch 'gitlab-shell' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 7 Feb 2013 08:25:47 +0000 (10:25 +0200)]
fix deploy key spec
Dmitriy Zaporozhets [Thu, 7 Feb 2013 08:06:39 +0000 (10:06 +0200)]
gitlab;shell init script
Dmitriy Zaporozhets [Thu, 7 Feb 2013 07:56:13 +0000 (09:56 +0200)]
deploy keys support for gitlab-shell api
Dmitriy Zaporozhets [Thu, 7 Feb 2013 07:42:22 +0000 (09:42 +0200)]
dont allow duplicates in ssh keys
Jon Evans [Wed, 6 Feb 2013 14:27:09 +0000 (09:27 -0500)]
Update app/views/admin/users/_form.html.haml
Jon Evans [Wed, 6 Feb 2013 14:26:46 +0000 (09:26 -0500)]
Ruby 1.9 hash syntax
Jon Evans [Wed, 6 Feb 2013 13:50:35 +0000 (08:50 -0500)]
Disable autocomplete for admin/users form
Fixes #2796
Marin Jankovski [Wed, 6 Feb 2013 11:44:09 +0000 (12:44 +0100)]
Add user delete option.
Dmitriy Zaporozhets [Wed, 6 Feb 2013 11:19:29 +0000 (03:19 -0800)]
Merge pull request #2877 from former03/feature_groups_api
Add groups api
Dmitriy Zaporozhets [Tue, 5 Feb 2013 13:59:40 +0000 (15:59 +0200)]
remove hooks and support scripts from main repo. Moved to gitlab-shell
Dmitriy Zaporozhets [Tue, 5 Feb 2013 13:55:49 +0000 (15:55 +0200)]
api check call
Dmitriy Zaporozhets [Tue, 5 Feb 2013 12:10:28 +0000 (04:10 -0800)]
Merge pull request #2906 from redorkulated/patch-4
Update step 5 "database" (Issue #2894)
Dmitriy Zaporozhets [Tue, 5 Feb 2013 11:43:25 +0000 (13:43 +0200)]
fix move repository
Dmitriy Zaporozhets [Tue, 5 Feb 2013 11:30:56 +0000 (13:30 +0200)]
no need to run gitolite for enable_automerge
Dmitriy Zaporozhets [Tue, 5 Feb 2013 11:02:58 +0000 (13:02 +0200)]
Improving installation docs
Sato Hiroyuki [Tue, 5 Feb 2013 10:58:49 +0000 (19:58 +0900)]
Sort the commits on network graph by commiter date.
Author date is not updated, if the commits is rebased.
So the network graph having many rebased commit turns round and round,
that it is very difficult to undarstand history.
Dmitriy Zaporozhets [Tue, 5 Feb 2013 10:47:50 +0000 (12:47 +0200)]
Fixed: post-receive, project remove, tests
Sato Hiroyuki [Tue, 5 Feb 2013 05:59:13 +0000 (14:59 +0900)]
Fix bug when it has been switched to tag.
Sato Hiroyuki [Tue, 5 Feb 2013 03:46:31 +0000 (12:46 +0900)]
Add search box for the commit.
Dmitriy Zaporozhets [Tue, 5 Feb 2013 09:12:15 +0000 (11:12 +0200)]
add remove keys from gitlab-shell by id
Dmitriy Zaporozhets [Tue, 5 Feb 2013 08:15:49 +0000 (10:15 +0200)]
Remove outdated specs and fixed key remove
Dmitriy Zaporozhets [Tue, 5 Feb 2013 07:17:45 +0000 (09:17 +0200)]
update structure
Dmitriy Zaporozhets [Tue, 5 Feb 2013 07:14:35 +0000 (09:14 +0200)]
remove unexisting stubs
Dmitriy Zaporozhets [Tue, 5 Feb 2013 07:01:29 +0000 (09:01 +0200)]
updated
Sato Hiroyuki [Tue, 5 Feb 2013 03:42:30 +0000 (12:42 +0900)]
Enable to display the commit older than 650th commit.
Sato Hiroyuki [Tue, 5 Feb 2013 03:34:35 +0000 (12:34 +0900)]
The commit is marked and displayed in the center.
Sato Hiroyuki [Tue, 5 Feb 2013 03:20:04 +0000 (12:20 +0900)]
Fix typo.
Dmitriy Zaporozhets [Mon, 4 Feb 2013 16:18:36 +0000 (18:18 +0200)]
remove gitolite stub
Dmitriy Zaporozhets [Mon, 4 Feb 2013 15:53:43 +0000 (17:53 +0200)]
Internal API
Dmitriy Zaporozhets [Mon, 4 Feb 2013 14:19:37 +0000 (16:19 +0200)]
Fix satellites to use filesystem. Correct post-receive user finder
Dmitriy Zaporozhets [Mon, 4 Feb 2013 13:24:16 +0000 (15:24 +0200)]
remove update_repository calls
Dmitriy Zaporozhets [Mon, 4 Feb 2013 13:18:20 +0000 (15:18 +0200)]
update installation docs
Dmitriy Zaporozhets [Mon, 4 Feb 2013 13:07:56 +0000 (15:07 +0200)]
Make gitlab works with gitlab-shell
Dmitriy Zaporozhets [Mon, 4 Feb 2013 12:28:10 +0000 (14:28 +0200)]
preparing for gitlab-shell
Michael [Mon, 4 Feb 2013 11:36:05 +0000 (11:36 +0000)]
Update step 5 "database" (Issue #2894)
Made it a bit clearer what step 5 is for to stop people skipping it. This time with a relative link.
Christian Simon [Sun, 3 Feb 2013 18:38:33 +0000 (19:38 +0100)]
Code deduplication using inheritance for GroupDetail
Dmitriy Zaporozhets [Sat, 2 Feb 2013 18:32:13 +0000 (20:32 +0200)]
Dont allow gitlab be loaded in iframe
Riyad Preukschas [Fri, 1 Feb 2013 20:18:09 +0000 (21:18 +0100)]
Port changes from #2803
Riyad Preukschas [Fri, 1 Feb 2013 20:06:15 +0000 (21:06 +0100)]
Small fixes to the installation guide and check task
Riyad Preukschas [Fri, 1 Feb 2013 19:56:03 +0000 (20:56 +0100)]
Merge pull request #2440 from klamontagne/master
Don't setuid the repositories on installation
Christian Simon [Fri, 1 Feb 2013 17:58:53 +0000 (18:58 +0100)]
Add test for duplicate group paths
Dmitriy Zaporozhets [Fri, 1 Feb 2013 17:07:54 +0000 (19:07 +0200)]
Fix crash on team update
Dmitriy Zaporozhets [Fri, 1 Feb 2013 17:04:11 +0000 (19:04 +0200)]
Ability to manage and remove group as owner outside of admin area
Dmitriy Zaporozhets [Fri, 1 Feb 2013 15:04:41 +0000 (17:04 +0200)]
Add a delay for sending emails
Christian Simon [Fri, 1 Feb 2013 14:00:12 +0000 (15:00 +0100)]
Fix groups api: differ between users and admin
Christian Simon [Fri, 1 Feb 2013 13:59:22 +0000 (14:59 +0100)]
Add docs/tests for groups api
Dmitriy Zaporozhets [Fri, 1 Feb 2013 13:37:21 +0000 (15:37 +0200)]
Fix mailer tests
Christian Simon [Tue, 8 Jan 2013 21:05:00 +0000 (22:05 +0100)]
Add api for creating/listing/viewing groups
Dmitriy Zaporozhets [Fri, 1 Feb 2013 07:33:12 +0000 (09:33 +0200)]
fix app crash if author is missing
Dmitriy Zaporozhets [Fri, 1 Feb 2013 06:59:30 +0000 (08:59 +0200)]
Fix sending commit note email to id instead email
Dmitriy Zaporozhets [Thu, 31 Jan 2013 18:44:20 +0000 (10:44 -0800)]
Merge pull request #2839 from m4tthumphrey/protected-branches-api
Added methods to protect and unprotect branches in from the API
Dmitriy Zaporozhets [Thu, 31 Jan 2013 11:13:17 +0000 (13:13 +0200)]
fix notes specs
Dmitriy Zaporozhets [Thu, 31 Jan 2013 11:00:50 +0000 (13:00 +0200)]
Merge branch 'extend_user_api' of https://github.com/bladealslayer/gitlabhq into bladealslayer-extend_user_api
Conflicts:
spec/requests/api/users_spec.rb
Dmitriy Zaporozhets [Thu, 31 Jan 2013 10:54:48 +0000 (02:54 -0800)]
Merge pull request #2711 from fbehrens/patch-1
Update config/database.yml.postgresql
Dmitriy Zaporozhets [Thu, 31 Jan 2013 10:33:59 +0000 (02:33 -0800)]
Merge pull request #2855 from hiroponz/fix-bug-of-network-graph
Fix bug of network graph(#2847) and trivial code clean up.
Dmitriy Zaporozhets [Thu, 31 Jan 2013 10:08:56 +0000 (12:08 +0200)]
fix active tabs tests
Matt Humphrey [Mon, 28 Jan 2013 17:22:44 +0000 (17:22 +0000)]
Added methods to protect and unprotect branches
Dmitriy Zaporozhets [Thu, 31 Jan 2013 09:22:06 +0000 (11:22 +0200)]
a bit of restyling. Replace some images with icons. Simplify note form
Sato Hiroyuki [Thu, 31 Jan 2013 08:29:36 +0000 (17:29 +0900)]
Fix bug of network graph(#2847) and trivial code clean up.