OSDN Git Service
Dmitriy Zaporozhets [Tue, 19 Feb 2013 08:51:08 +0000 (00:51 -0800)]
Merge pull request #3013 from crystax/master
Sort groups alphabetically on dashboard page
Dmitriy Zaporozhets [Tue, 19 Feb 2013 07:43:41 +0000 (09:43 +0200)]
Fix project filter for MR on dashboard
Dmitry Moskalchuk [Tue, 19 Feb 2013 07:13:19 +0000 (11:13 +0400)]
Syntax fix of sorting groups/users
Dmitriy Zaporozhets [Mon, 18 Feb 2013 19:21:24 +0000 (21:21 +0200)]
Dont show assigned_teams block unless any. Show count in filter
Dmitriy Zaporozhets [Mon, 18 Feb 2013 19:10:49 +0000 (21:10 +0200)]
Refactor and restyle team page for project
Dmitriy Zaporozhets [Mon, 18 Feb 2013 18:31:43 +0000 (20:31 +0200)]
no projects message in group area
Dmitriy Zaporozhets [Mon, 18 Feb 2013 18:02:32 +0000 (10:02 -0800)]
Merge pull request #2998 from axilleas/master
Minor changes to installation and databases docs.
Dmitriy Zaporozhets [Mon, 18 Feb 2013 18:01:09 +0000 (10:01 -0800)]
Merge pull request #2990 from raphendyr/gitignore_and_logrotate
Change .gitignore to ignore logrotated log files.
Dmitriy Zaporozhets [Mon, 18 Feb 2013 17:59:24 +0000 (09:59 -0800)]
Merge pull request #2991 from raphendyr/username_change_disablation
Add option to disable username changing
Dmitriy Zaporozhets [Mon, 18 Feb 2013 17:56:35 +0000 (09:56 -0800)]
Merge pull request #2996 from raphendyr/ssh_fingerprint_fix
Ssh fingerprint fix
Dmitriy Zaporozhets [Mon, 18 Feb 2013 14:40:11 +0000 (16:40 +0200)]
Fix not-working team memebership permissions change
Dmitriy Zaporozhets [Mon, 18 Feb 2013 12:46:45 +0000 (12:46 +0000)]
Merge branch 'count_user_owned_projects' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 18 Feb 2013 12:35:38 +0000 (14:35 +0200)]
Add user to team he creates
Marin Jankovski [Mon, 18 Feb 2013 12:15:35 +0000 (13:15 +0100)]
Count owned projects, not just personal
Dmitriy Zaporozhets [Mon, 18 Feb 2013 07:28:18 +0000 (09:28 +0200)]
Prevent xss attack over group name. Added regex validation for group and team name
Jaakko Kantojärvi [Sun, 17 Feb 2013 17:38:45 +0000 (19:38 +0200)]
Fix ssh key test by adding valid ssh key
Jaakko Kantojärvi [Fri, 15 Feb 2013 09:31:05 +0000 (11:31 +0200)]
Tests to validate that invalid keys are rejected
Dmitriy Zaporozhets [Sun, 17 Feb 2013 14:18:42 +0000 (16:18 +0200)]
use attachment secure_url for Attachemnt page
Dmitriy Zaporozhets [Sun, 17 Feb 2013 14:15:33 +0000 (06:15 -0800)]
Merge pull request #3017 from jojosch/owner-link-admin
Fix link to owner of group and team in admin interface
Dmitriy Zaporozhets [Sun, 17 Feb 2013 10:16:19 +0000 (12:16 +0200)]
redesign mars theme a bit. Better border color for search-input for dark theme
Dmitriy Zaporozhets [Sun, 17 Feb 2013 10:05:26 +0000 (12:05 +0200)]
Fix link color for dark theme
Johannes Schleifenbaum [Sun, 17 Feb 2013 10:00:02 +0000 (11:00 +0100)]
Fix link to owner of group and team in admin interface
Dmitriy Zaporozhets [Sat, 16 Feb 2013 19:47:43 +0000 (21:47 +0200)]
create satellite for imported repo
Dmitriy Zaporozhets [Sat, 16 Feb 2013 19:37:06 +0000 (21:37 +0200)]
Fix logo alignment for default theme
Dmitriy Zaporozhets [Sat, 16 Feb 2013 19:35:11 +0000 (21:35 +0200)]
Add logo to deploy.html
Dmitriy Zaporozhets [Sat, 16 Feb 2013 19:24:51 +0000 (21:24 +0200)]
Reduce size of nav panel. Fixed nav background for IE. Refactored mars theme
Dmitry Moskalchuk [Sat, 16 Feb 2013 15:40:33 +0000 (19:40 +0400)]
Sort groups/namespaces by human name
Dmitry Moskalchuk [Sat, 16 Feb 2013 15:11:36 +0000 (19:11 +0400)]
Sort groups alphabetically on dashboard page
Dmitriy Zaporozhets [Sat, 16 Feb 2013 12:45:20 +0000 (12:45 +0000)]
Merge branch 'features/attachment_server' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 16 Feb 2013 12:42:22 +0000 (14:42 +0200)]
uppercase Gitlab version and revision constants. check api return gitlab version now
Dmitriy Zaporozhets [Sat, 16 Feb 2013 09:10:36 +0000 (01:10 -0800)]
Merge pull request #2994 from dasbh/master
Fix gitlab:setup task on fresh installation
Dmitriy Zaporozhets [Sat, 16 Feb 2013 09:09:45 +0000 (01:09 -0800)]
Merge pull request #3002 from nafu/repo_patch
Fix file_name for archive
Dmitriy Zaporozhets [Sat, 16 Feb 2013 09:08:33 +0000 (01:08 -0800)]
Merge pull request #3003 from livedata/patch-1
fixed API access to the project
Axilleas Pipinellis [Sat, 16 Feb 2013 06:24:36 +0000 (08:24 +0200)]
Added creation of pids directory to fix #2995, replaced deprecated nginx init.d command with service one, some more clean-up
Axilleas Pipinellis [Sat, 16 Feb 2013 05:50:41 +0000 (07:50 +0200)]
Nginx: edit actual file instead of symlink
livedata [Fri, 15 Feb 2013 14:37:06 +0000 (15:37 +0100)]
fixed API access to the project
Fumiya Nakamura [Fri, 15 Feb 2013 13:50:42 +0000 (05:50 -0800)]
Fix file_path to correspond with the name
Fumiya Nakamura [Fri, 15 Feb 2013 12:58:57 +0000 (04:58 -0800)]
Fix file_name for archive
Axilleas Pipinellis [Fri, 15 Feb 2013 10:20:50 +0000 (12:20 +0200)]
Added relative urls to other documentation files, removed duplicate debian update commands
Axilleas Pipinellis [Fri, 15 Feb 2013 09:53:35 +0000 (11:53 +0200)]
Run db:setup and db:seed_fu before gitlab:setup
Axilleas Pipinellis [Fri, 15 Feb 2013 09:52:10 +0000 (11:52 +0200)]
Connect to database with git user, not gitlab
Jaakko Kantojärvi [Fri, 15 Feb 2013 09:16:21 +0000 (11:16 +0200)]
Fix ssh key fingerprinting test to use exitcode
Dmitriy Zaporozhets [Fri, 15 Feb 2013 07:51:21 +0000 (09:51 +0200)]
Per project protection
Dmitriy Zaporozhets [Fri, 15 Feb 2013 07:49:35 +0000 (09:49 +0200)]
skip protection to aws3
Dmitriy Zaporozhets [Fri, 15 Feb 2013 07:16:46 +0000 (09:16 +0200)]
remove commented code
Bhagavan Das [Thu, 14 Feb 2013 23:10:18 +0000 (23:10 +0000)]
Remove hardcoded refernce to gitlab-shell home. so that gitlab can be installed on any unix account other than git
Bhagavan Das [Thu, 14 Feb 2013 21:39:48 +0000 (21:39 +0000)]
rename setup to setup_db so that it does not collide with gitlab:shell:setup task
Riyad Preukschas [Thu, 14 Feb 2013 19:07:46 +0000 (11:07 -0800)]
Merge pull request #2890 from cameronyule/support_osx_groups
OS X support for gitlab:check rake tasks
Jaakko Kantojärvi [Wed, 30 Jan 2013 20:14:34 +0000 (22:14 +0200)]
Add option to disable username changing
This option allows to disable users from changing their username.
This is very usefull in environments using strong internal authentication methods like ldap, pam or shibboleth.
You can allow users to change theyr username in these environments, but then new users (users loging in first time) is blocked from gitlab is her username exists.
Jaakko Kantojärvi [Mon, 4 Feb 2013 11:12:10 +0000 (13:12 +0200)]
Change .gitignore to ignore logrotated log files.
Dmitriy Zaporozhets [Thu, 14 Feb 2013 14:00:40 +0000 (06:00 -0800)]
Merge pull request #2987 from Undev/support_env_in_settings
Environments support added to Gitlab config
Dmitriy Zaporozhets [Thu, 14 Feb 2013 13:53:07 +0000 (05:53 -0800)]
Merge pull request #2989 from PierreGambarotto/master
archive download : namespace directory not created
Pierre Gambarotto [Thu, 14 Feb 2013 13:29:24 +0000 (14:29 +0100)]
fix archive download : not creating namespace directory
Dmitriy Zaporozhets [Thu, 14 Feb 2013 13:25:55 +0000 (15:25 +0200)]
require missing lib
Dmitriy Zaporozhets [Thu, 14 Feb 2013 13:17:43 +0000 (15:17 +0200)]
Gitlab::ShellEnv added
Dmitriy Zaporozhets [Thu, 14 Feb 2013 12:00:02 +0000 (14:00 +0200)]
Update post-receive worker to use correct identifier
Andrew8xx8 [Thu, 14 Feb 2013 07:44:34 +0000 (11:44 +0400)]
Environments support added to Gitlab config
Dmitriy Zaporozhets [Wed, 13 Feb 2013 17:14:35 +0000 (19:14 +0200)]
Redesign Admin -> user -> show page
Dmitriy Zaporozhets [Wed, 13 Feb 2013 15:28:28 +0000 (17:28 +0200)]
style admin -> users page. Search by username too
Dmitriy Zaporozhets [Wed, 13 Feb 2013 13:27:18 +0000 (15:27 +0200)]
Add placeholder for project import
Dmitriy Zaporozhets [Wed, 13 Feb 2013 13:11:37 +0000 (15:11 +0200)]
Merge branch 'mikew-unicorn-app-dir-fix'
Dmitriy Zaporozhets [Wed, 13 Feb 2013 13:11:26 +0000 (15:11 +0200)]
Merge branch 'unicorn-app-dir-fix' of https://github.com/mikew/gitlabhq into mikew-unicorn-app-dir-fix
Conflicts:
config/unicorn.rb.example
Dmitriy Zaporozhets [Wed, 13 Feb 2013 12:33:01 +0000 (04:33 -0800)]
Merge pull request #2979 from Undev/fix_naming
Constants in Events looks good now
Andrew8xx8 [Wed, 13 Feb 2013 11:48:16 +0000 (15:48 +0400)]
Constants in Events looks good now
Dmitriy Zaporozhets [Wed, 13 Feb 2013 06:17:24 +0000 (22:17 -0800)]
Merge pull request #2971 from yuters/patch-1
Some fix for gitlab:gitlab_shell:check
Martin Bastien [Tue, 12 Feb 2013 17:49:11 +0000 (12:49 -0500)]
Forgot gitlab-shell folder
Martin Bastien [Tue, 12 Feb 2013 17:42:36 +0000 (12:42 -0500)]
Some fix for gitlab:gitlab_shell:check
Fixing issue #2970
Dmitriy Zaporozhets [Tue, 12 Feb 2013 17:25:53 +0000 (09:25 -0800)]
Merge pull request #2969 from zerustech/patch-1
Update lib/tasks/sidekiq.rake
Dmitriy Zaporozhets [Tue, 12 Feb 2013 17:24:54 +0000 (09:24 -0800)]
Merge pull request #2946 from Asquera/fix/access_to_non_existent_branch
API: Fixes return code when accessing non existent branch (#2922)
Dmitriy Zaporozhets [Tue, 12 Feb 2013 17:22:49 +0000 (19:22 +0200)]
Merge branch 'hiroponz-easy-to-find-commit-on-network-graph'
Dmitriy Zaporozhets [Tue, 12 Feb 2013 17:22:40 +0000 (19:22 +0200)]
style network graph form a bit
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
Michael Lee [Tue, 12 Feb 2013 15:01:55 +0000 (23:01 +0800)]
Update lib/tasks/sidekiq.rake
Mac OS uses launchd instead of /etc/init.d to start daemons and tasks to be started by launchd MUST NOT daemon itself. So "nohup" here won't work for Mac OS.
Can we add a "launchd" task to the rake file so that we can start sidekiq as "bundle exec rake sidekiq:launchd" ?
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 19:31:19 +0000 (21:31 +0200)]
handle attahcment with send_file
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