OSDN Git Service

wvm/gitlab.git
11 years agoCreating test values moved to before
Andrew8xx8 [Mon, 18 Feb 2013 13:52:39 +0000 (17:52 +0400)]
Creating test values moved to before

11 years agoHash syntax improved
Andrew8xx8 [Mon, 18 Feb 2013 13:22:18 +0000 (17:22 +0400)]
Hash syntax improved

11 years agoDebug remomved
Andrew8xx8 [Mon, 18 Feb 2013 13:16:29 +0000 (17:16 +0400)]
Debug remomved

11 years agoStates events fixed
Andrew8xx8 [Mon, 18 Feb 2013 12:49:56 +0000 (16:49 +0400)]
States events fixed

11 years agoObserver refactored to use StateMachine events
Andrew8xx8 [Mon, 18 Feb 2013 12:49:17 +0000 (16:49 +0400)]
Observer refactored to use StateMachine events

11 years agoSpinach tests fixed
Andrew8xx8 [Mon, 18 Feb 2013 10:43:08 +0000 (14:43 +0400)]
Spinach tests fixed

11 years agoAdditional tests added to Issue
Andrew8xx8 [Mon, 18 Feb 2013 09:41:32 +0000 (13:41 +0400)]
Additional tests added to Issue

11 years agoAdditional tests added to Milestone
Andrew8xx8 [Mon, 18 Feb 2013 09:38:29 +0000 (13:38 +0400)]
Additional tests added to Milestone

11 years agoMigrations for StateMachine refactoring added
Andrew8xx8 [Mon, 18 Feb 2013 09:14:23 +0000 (13:14 +0400)]
Migrations for StateMachine refactoring added

11 years agoIssue uses StateMachine now
Andrew8xx8 [Mon, 18 Feb 2013 09:10:58 +0000 (13:10 +0400)]
Issue uses StateMachine now

11 years agoMilestone uses StateMachine now
Andrew8xx8 [Mon, 18 Feb 2013 09:10:09 +0000 (13:10 +0400)]
Milestone uses StateMachine now

11 years agoMerge Request uses StateMachine now
Andrew8xx8 [Mon, 18 Feb 2013 09:07:49 +0000 (13:07 +0400)]
Merge Request uses StateMachine now

11 years agoMerge Request uses StateMachine now
Andrew8xx8 [Mon, 18 Feb 2013 08:40:56 +0000 (12:40 +0400)]
Merge Request uses StateMachine now

11 years agoIssuable consern uses StateMachine now
Andrew8xx8 [Mon, 18 Feb 2013 08:36:50 +0000 (12:36 +0400)]
Issuable consern uses StateMachine now

11 years agoState renamed to merge_status
Andrew8xx8 [Fri, 15 Feb 2013 08:27:13 +0000 (12:27 +0400)]
State renamed to merge_status

11 years agoState machine gem added
Andrew8xx8 [Thu, 14 Feb 2013 15:33:20 +0000 (19:33 +0400)]
State machine gem added

11 years agoPrevent xss attack over group name. Added regex validation for group and team name
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

11 years agouse attachment secure_url for Attachemnt page
Dmitriy Zaporozhets [Sun, 17 Feb 2013 14:18:42 +0000 (16:18 +0200)]
use attachment secure_url for Attachemnt page

11 years agoMerge pull request #3017 from jojosch/owner-link-admin
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

11 years agoredesign mars theme a bit. Better border color for search-input for dark theme
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

11 years agoFix link color for dark theme
Dmitriy Zaporozhets [Sun, 17 Feb 2013 10:05:26 +0000 (12:05 +0200)]
Fix link color for dark theme

11 years agoFix link to owner of group and team in admin interface
Johannes Schleifenbaum [Sun, 17 Feb 2013 10:00:02 +0000 (11:00 +0100)]
Fix link to owner of group and team in admin interface

11 years agocreate satellite for imported repo
Dmitriy Zaporozhets [Sat, 16 Feb 2013 19:47:43 +0000 (21:47 +0200)]
create satellite for imported repo

11 years agoFix logo alignment for default theme
Dmitriy Zaporozhets [Sat, 16 Feb 2013 19:37:06 +0000 (21:37 +0200)]
Fix logo alignment for default theme

11 years agoAdd logo to deploy.html
Dmitriy Zaporozhets [Sat, 16 Feb 2013 19:35:11 +0000 (21:35 +0200)]
Add logo to deploy.html

11 years agoReduce size of nav panel. Fixed nav background for IE. Refactored mars theme
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

11 years agoMerge branch 'features/attachment_server' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 16 Feb 2013 12:45:20 +0000 (12:45 +0000)]
Merge branch 'features/attachment_server' of /home/git/repositories/gitlab/gitlabhq

11 years agouppercase Gitlab version and revision constants. check api return gitlab version now
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

11 years agoMerge pull request #2994 from dasbh/master
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

11 years agoMerge pull request #3002 from nafu/repo_patch
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

11 years agoMerge pull request #3003 from livedata/patch-1
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

11 years agofixed API access to the project
livedata [Fri, 15 Feb 2013 14:37:06 +0000 (15:37 +0100)]
fixed API access to the project

11 years agoFix file_path to correspond with the name
Fumiya Nakamura [Fri, 15 Feb 2013 13:50:42 +0000 (05:50 -0800)]
Fix file_path to correspond with the name

11 years agoFix file_name for archive
Fumiya Nakamura [Fri, 15 Feb 2013 12:58:57 +0000 (04:58 -0800)]
Fix file_name for archive

11 years agoPer project protection
Dmitriy Zaporozhets [Fri, 15 Feb 2013 07:51:21 +0000 (09:51 +0200)]
Per project protection

11 years agoskip protection to aws3
Dmitriy Zaporozhets [Fri, 15 Feb 2013 07:49:35 +0000 (09:49 +0200)]
skip protection to aws3

11 years agoremove commented code
Dmitriy Zaporozhets [Fri, 15 Feb 2013 07:16:46 +0000 (09:16 +0200)]
remove commented code

11 years agoRemove hardcoded refernce to gitlab-shell home. so that gitlab can be installed on...
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

11 years agorename setup to setup_db so that it does not collide with gitlab:shell:setup task
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

11 years agoMerge pull request #2890 from cameronyule/support_osx_groups
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

11 years agoMerge pull request #2987 from Undev/support_env_in_settings
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

11 years agoMerge pull request #2989 from PierreGambarotto/master
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

11 years agofix archive download : not creating namespace directory
Pierre Gambarotto [Thu, 14 Feb 2013 13:29:24 +0000 (14:29 +0100)]
fix archive download : not creating namespace directory

11 years agorequire missing lib
Dmitriy Zaporozhets [Thu, 14 Feb 2013 13:25:55 +0000 (15:25 +0200)]
require missing lib

11 years agoGitlab::ShellEnv added
Dmitriy Zaporozhets [Thu, 14 Feb 2013 13:17:43 +0000 (15:17 +0200)]
Gitlab::ShellEnv added

11 years agoUpdate post-receive worker to use correct identifier
Dmitriy Zaporozhets [Thu, 14 Feb 2013 12:00:02 +0000 (14:00 +0200)]
Update post-receive worker to use correct identifier

11 years agoEnvironments support added to Gitlab config
Andrew8xx8 [Thu, 14 Feb 2013 07:44:34 +0000 (11:44 +0400)]
Environments support added to Gitlab config

11 years agoRedesign Admin -> user -> show page
Dmitriy Zaporozhets [Wed, 13 Feb 2013 17:14:35 +0000 (19:14 +0200)]
Redesign Admin -> user -> show page

11 years agostyle admin -> users page. Search by username too
Dmitriy Zaporozhets [Wed, 13 Feb 2013 15:28:28 +0000 (17:28 +0200)]
style admin -> users page. Search by username too

11 years agoAdd placeholder for project import
Dmitriy Zaporozhets [Wed, 13 Feb 2013 13:27:18 +0000 (15:27 +0200)]
Add placeholder for project import

11 years agoMerge branch 'mikew-unicorn-app-dir-fix'
Dmitriy Zaporozhets [Wed, 13 Feb 2013 13:11:37 +0000 (15:11 +0200)]
Merge branch 'mikew-unicorn-app-dir-fix'

11 years agoMerge branch 'unicorn-app-dir-fix' of https://github.com/mikew/gitlabhq into mikew...
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

11 years agoMerge pull request #2979 from Undev/fix_naming
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

11 years agoConstants in Events looks good now
Andrew8xx8 [Wed, 13 Feb 2013 11:48:16 +0000 (15:48 +0400)]
Constants in Events looks good now

11 years agoMerge pull request #2971 from yuters/patch-1
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

11 years agoForgot gitlab-shell folder
Martin Bastien [Tue, 12 Feb 2013 17:49:11 +0000 (12:49 -0500)]
Forgot gitlab-shell folder

11 years agoSome fix for gitlab:gitlab_shell:check
Martin Bastien [Tue, 12 Feb 2013 17:42:36 +0000 (12:42 -0500)]
Some fix for gitlab:gitlab_shell:check

Fixing issue #2970

11 years agoMerge pull request #2969 from zerustech/patch-1
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

11 years agoMerge pull request #2946 from Asquera/fix/access_to_non_existent_branch
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)

11 years agoMerge branch 'hiroponz-easy-to-find-commit-on-network-graph'
Dmitriy Zaporozhets [Tue, 12 Feb 2013 17:22:49 +0000 (19:22 +0200)]
Merge branch 'hiroponz-easy-to-find-commit-on-network-graph'

11 years agostyle network graph form a bit
Dmitriy Zaporozhets [Tue, 12 Feb 2013 17:22:40 +0000 (19:22 +0200)]
style network graph form a bit

11 years agoMerge branch 'easy-to-find-commit-on-network-graph' of https://github.com/hiroponz...
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

11 years agoMerge pull request #2924 from cdawzrd/patch-2
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

11 years agoUpdate lib/tasks/sidekiq.rake
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" ?

11 years agoMerge branch 'user_delete_account' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 12 Feb 2013 10:53:51 +0000 (10:53 +0000)]
Merge branch 'user_delete_account' of /home/git/repositories/gitlab/gitlabhq

11 years agoMerge pull request #2965 from yurifury/fix-blob-route
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.

11 years agoMerge branch 'Undev-fix-db-after-updating-rails'
Dmitriy Zaporozhets [Tue, 12 Feb 2013 09:47:02 +0000 (11:47 +0200)]
Merge branch 'Undev-fix-db-after-updating-rails'

11 years agorename scope to prevent name collision
Dmitriy Zaporozhets [Tue, 12 Feb 2013 09:46:50 +0000 (11:46 +0200)]
rename scope to prevent name collision

11 years agoMerge branch 'fix-db-after-updating-rails' of https://github.com/Undev/gitlabhq into...
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

11 years agorestore handling exception for project creation
Dmitriy Zaporozhets [Tue, 12 Feb 2013 08:41:21 +0000 (10:41 +0200)]
restore handling exception for project creation

11 years agoFix for incorrect routing to the Compare controller
Yuri Feldman [Tue, 12 Feb 2013 08:26:42 +0000 (19:26 +1100)]
Fix for incorrect routing to the Compare controller

11 years agoTest to show incorrect routing to Compare controller
Yuri Feldman [Tue, 12 Feb 2013 07:56:53 +0000 (18:56 +1100)]
Test to show incorrect routing to Compare controller

11 years agoAll scopes must be in lambdas
Andrew8xx8 [Tue, 12 Feb 2013 07:16:45 +0000 (11:16 +0400)]
All scopes must be in lambdas

11 years agoDynamic values must be in blocks if FG
Andrew8xx8 [Tue, 12 Feb 2013 06:54:56 +0000 (10:54 +0400)]
Dynamic values must be in blocks if FG

11 years agoRender events for team dashboard
Dmitriy Zaporozhets [Mon, 11 Feb 2013 21:23:38 +0000 (23:23 +0200)]
Render events for team dashboard

11 years agoRails up to 3.2.12
Dmitriy Zaporozhets [Mon, 11 Feb 2013 21:17:34 +0000 (23:17 +0200)]
Rails up to 3.2.12

11 years agoFix project creation without import
Dmitriy Zaporozhets [Mon, 11 Feb 2013 21:13:21 +0000 (23:13 +0200)]
Fix project creation without import

11 years agoImport repo feature
Dmitriy Zaporozhets [Mon, 11 Feb 2013 21:00:12 +0000 (23:00 +0200)]
Import repo feature

11 years agohandle attahcment with send_file
Dmitriy Zaporozhets [Mon, 11 Feb 2013 19:31:19 +0000 (21:31 +0200)]
handle attahcment with send_file

11 years agofixing tests after refactoring
Dmitriy Zaporozhets [Mon, 11 Feb 2013 18:28:27 +0000 (20:28 +0200)]
fixing tests after refactoring

11 years agoadd import repo gitlab_shell call
Dmitriy Zaporozhets [Mon, 11 Feb 2013 17:41:02 +0000 (19:41 +0200)]
add import repo gitlab_shell call

11 years agouse proper name for gitlabshell worker
Dmitriy Zaporozhets [Mon, 11 Feb 2013 17:27:26 +0000 (19:27 +0200)]
use proper name for gitlabshell worker

11 years agoFix procfile and attachment in event nore
Dmitriy Zaporozhets [Mon, 11 Feb 2013 17:25:06 +0000 (19:25 +0200)]
Fix procfile and attachment in event nore

11 years agoNo gitolite in project any more
Dmitriy Zaporozhets [Mon, 11 Feb 2013 17:16:59 +0000 (19:16 +0200)]
No gitolite in project any more

11 years agorender note with attachment for event
Dmitriy Zaporozhets [Mon, 11 Feb 2013 13:47:01 +0000 (15:47 +0200)]
render note with attachment for event

11 years agoUPdate field name.
Marin Jankovski [Mon, 11 Feb 2013 12:12:41 +0000 (13:12 +0100)]
UPdate field name.

11 years agoTest the delete acount option.
Marin Jankovski [Mon, 11 Feb 2013 12:06:37 +0000 (13:06 +0100)]
Test the delete acount option.

11 years agofix attachment uploader for aws
Dmitriy Zaporozhets [Mon, 11 Feb 2013 08:14:32 +0000 (10:14 +0200)]
fix attachment uploader for aws

11 years agoFIx gitlab:env:info
Dmitriy Zaporozhets [Mon, 11 Feb 2013 08:02:52 +0000 (10:02 +0200)]
FIx gitlab:env:info

11 years agoFix gitlab:check
Dmitriy Zaporozhets [Mon, 11 Feb 2013 07:58:02 +0000 (09:58 +0200)]
Fix gitlab:check

11 years agoSince gitlab-shell no sense to check hooks
Dmitriy Zaporozhets [Mon, 11 Feb 2013 07:15:42 +0000 (09:15 +0200)]
Since gitlab-shell no sense to check hooks

11 years agoChanged function to `not_found`.
Sebastian Ziebell [Sat, 9 Feb 2013 19:54:52 +0000 (20:54 +0100)]
Changed function to `not_found`.

Instead of using funtion `error!` the function `not_found!` is used to return 404 error. Adjusted documentation accordingly.

11 years agoremoving outdated checks
Dmitriy Zaporozhets [Sat, 9 Feb 2013 13:34:04 +0000 (15:34 +0200)]
removing outdated checks

11 years agoignore docs by git
Dmitriy Zaporozhets [Sat, 9 Feb 2013 13:26:47 +0000 (15:26 +0200)]
ignore docs by git

11 years agocleanup rake tasks since no gitolite required
Dmitriy Zaporozhets [Sat, 9 Feb 2013 13:21:19 +0000 (15:21 +0200)]
cleanup rake tasks since no gitolite required

11 years agoshow project head for empty project
Dmitriy Zaporozhets [Sat, 9 Feb 2013 13:16:33 +0000 (15:16 +0200)]
show project head for empty project

11 years agoRefactored and fixed seeds to work with gitlab-shell
Dmitriy Zaporozhets [Sat, 9 Feb 2013 13:13:56 +0000 (15:13 +0200)]
Refactored and fixed seeds to work with gitlab-shell

11 years agoremove useless warning
Dmitriy Zaporozhets [Sat, 9 Feb 2013 10:32:24 +0000 (12:32 +0200)]
remove useless warning

11 years agotask to build missing projects with gitlab-shell
Dmitriy Zaporozhets [Sat, 9 Feb 2013 10:30:49 +0000 (12:30 +0200)]
task to build missing projects with gitlab-shell

11 years agoStatus code 404 returned when retrieving non existent branch (issue #2922)
Sebastian Ziebell [Fri, 8 Feb 2013 16:04:08 +0000 (17:04 +0100)]
Status code 404 returned when retrieving non existent branch (issue #2922)

Accessing a repository branch that does not exist returns a 404 error instead
of 200 now. Added a test.