OSDN Git Service
Dmitriy Zaporozhets [Thu, 21 Feb 2013 11:09:47 +0000 (13:09 +0200)]
Fixing rspec after upgrade to capybara pt1
Dmitriy Zaporozhets [Thu, 21 Feb 2013 10:39:09 +0000 (12:39 +0200)]
Fix ambiguity for member link in test
Dmitriy Zaporozhets [Thu, 21 Feb 2013 10:27:52 +0000 (12:27 +0200)]
Team features are green now
Dmitriy Zaporozhets [Thu, 21 Feb 2013 09:44:33 +0000 (11:44 +0200)]
Monkeypatch satellite call for merge request in tests
Dmitriy Zaporozhets [Thu, 21 Feb 2013 09:27:22 +0000 (11:27 +0200)]
improve selectors to pass capybara 2.0
Dmitriy Zaporozhets [Thu, 21 Feb 2013 08:41:37 +0000 (10:41 +0200)]
move capybara scenarios to spec/features
Dmitriy Zaporozhets [Thu, 21 Feb 2013 08:41:13 +0000 (10:41 +0200)]
Add LoginHelpers to feature type
Dmitriy Zaporozhets [Thu, 21 Feb 2013 08:28:13 +0000 (10:28 +0200)]
Update capybara, poltergeist, spinach, rspec-rails
Dmitriy Zaporozhets [Thu, 21 Feb 2013 08:00:18 +0000 (10:00 +0200)]
Update sidekiq
Dmitriy Zaporozhets [Thu, 21 Feb 2013 07:25:07 +0000 (09:25 +0200)]
Fix merge state detection
Dmitriy Zaporozhets [Wed, 20 Feb 2013 13:22:38 +0000 (05:22 -0800)]
Merge pull request #3053 from m4tthumphrey/api-delete-hook-by-id
Fix RESTfulness of project hook deletions by API
Matt Humphrey [Wed, 20 Feb 2013 11:45:54 +0000 (11:45 +0000)]
Removed unnecessary paramter hash. Also tidied up hash format in hook creation spec
Matt Humphrey [Wed, 20 Feb 2013 11:35:36 +0000 (11:35 +0000)]
Fix RESTfulness of project hook deletions by API
Dmitriy Zaporozhets [Wed, 20 Feb 2013 10:47:30 +0000 (02:47 -0800)]
Merge pull request #2988 from Asquera/error_project_limit
API: creating last project before limit returns 404
Dmitriy Zaporozhets [Wed, 20 Feb 2013 10:45:07 +0000 (02:45 -0800)]
Merge pull request #3011 from Asquera/fix_access_to_nonvisible_hook
API: fixes visibility of project hook
Dmitriy Zaporozhets [Wed, 20 Feb 2013 10:41:35 +0000 (02:41 -0800)]
Merge pull request #3038 from dmedvinsky/commit-time
Add commit full time tooltip to `commited_ago`
Dmitriy Zaporozhets [Wed, 20 Feb 2013 10:29:16 +0000 (02:29 -0800)]
Merge pull request #3045 from eldios/patch-1
Update doc/install/installation.md
Dmitriy Zaporozhets [Wed, 20 Feb 2013 10:28:44 +0000 (02:28 -0800)]
Merge pull request #3043 from sjmulder/state-seed
Update seeds for state columns
Nihad Abbasov [Wed, 20 Feb 2013 07:41:32 +0000 (11:41 +0400)]
API docs: fix new milestone parameters
Lele [Wed, 20 Feb 2013 01:01:39 +0000 (02:01 +0100)]
Update doc/install/installation.md
changed installation overview list step #4
Gitolite -> GitLab shell
Sijmen Mulder [Tue, 19 Feb 2013 21:14:28 +0000 (22:14 +0100)]
Update seeds for state columns
Dmitry Medvinsky [Tue, 19 Feb 2013 15:13:54 +0000 (19:13 +0400)]
Add commit full time tooltip to `commited_ago`
Dmitriy Zaporozhets [Tue, 19 Feb 2013 11:27:42 +0000 (03:27 -0800)]
Merge pull request #3034 from Andrew8xx8/patch-2
Event already has author relation
Andrew Kulakov [Tue, 19 Feb 2013 11:22:29 +0000 (15:22 +0400)]
Event already has author relation
Dmitriy Zaporozhets [Tue, 19 Feb 2013 09:49:36 +0000 (01:49 -0800)]
Merge pull request #3032 from raphendyr/fix_development_environment
Fix development fixture for gitlab_shell
Dmitriy Zaporozhets [Tue, 19 Feb 2013 09:45:49 +0000 (11:45 +0200)]
Fix private flag for project
Jaakko Kantojärvi [Mon, 18 Feb 2013 16:03:29 +0000 (18:03 +0200)]
Fix development fixture for gitlab_shell
Dmitriy Zaporozhets [Tue, 19 Feb 2013 09:04:54 +0000 (11:04 +0200)]
Merge branch 'Undev-state-machine'
Dmitriy Zaporozhets [Tue, 19 Feb 2013 09:01:19 +0000 (11:01 +0200)]
Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
Conflicts:
app/models/issue.rb
app/models/merge_request.rb
Andrew8xx8 [Tue, 19 Feb 2013 08:57:09 +0000 (12:57 +0400)]
Javascript widget fixed
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
Andrew8xx8 [Tue, 19 Feb 2013 07:32:10 +0000 (11:32 +0400)]
Migrations iproved
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
Andrew8xx8 [Mon, 18 Feb 2013 14:54:30 +0000 (18:54 +0400)]
Migrations refactored ro support data convertion
Dmitriy Zaporozhets [Mon, 18 Feb 2013 14:40:11 +0000 (16:40 +0200)]
Fix not-working team memebership permissions change
Andrew8xx8 [Mon, 18 Feb 2013 13:52:39 +0000 (17:52 +0400)]
Creating test values moved to before
Andrew8xx8 [Mon, 18 Feb 2013 13:22:18 +0000 (17:22 +0400)]
Hash syntax improved
Andrew8xx8 [Mon, 18 Feb 2013 13:16:29 +0000 (17:16 +0400)]
Debug remomved
Andrew8xx8 [Mon, 18 Feb 2013 12:49:56 +0000 (16:49 +0400)]
States events fixed
Andrew8xx8 [Mon, 18 Feb 2013 12:49:17 +0000 (16:49 +0400)]
Observer refactored to use StateMachine events
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
Andrew8xx8 [Mon, 18 Feb 2013 10:43:08 +0000 (14:43 +0400)]
Spinach tests fixed
Andrew8xx8 [Mon, 18 Feb 2013 09:41:32 +0000 (13:41 +0400)]
Additional tests added to Issue
Andrew8xx8 [Mon, 18 Feb 2013 09:38:29 +0000 (13:38 +0400)]
Additional tests added to Milestone
Andrew8xx8 [Mon, 18 Feb 2013 09:14:23 +0000 (13:14 +0400)]
Migrations for StateMachine refactoring added
Andrew8xx8 [Mon, 18 Feb 2013 09:10:58 +0000 (13:10 +0400)]
Issue uses StateMachine now
Andrew8xx8 [Mon, 18 Feb 2013 09:10:09 +0000 (13:10 +0400)]
Milestone uses StateMachine now
Andrew8xx8 [Mon, 18 Feb 2013 09:07:49 +0000 (13:07 +0400)]
Merge Request uses StateMachine now
Andrew8xx8 [Mon, 18 Feb 2013 08:40:56 +0000 (12:40 +0400)]
Merge Request uses StateMachine now
Andrew8xx8 [Mon, 18 Feb 2013 08:36:50 +0000 (12:36 +0400)]
Issuable consern uses StateMachine now
Andrew8xx8 [Fri, 15 Feb 2013 08:27:13 +0000 (12:27 +0400)]
State renamed to merge_status
Andrew8xx8 [Thu, 14 Feb 2013 15:33:20 +0000 (19:33 +0400)]
State machine gem added
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
Sebastian Ziebell [Sat, 16 Feb 2013 13:42:49 +0000 (14:42 +0100)]
API: fixes visibility of project hook
When a user is not authorized to see the list of hooks for a project, he is
still able to access the hooks separately. For example if access to
`GET /projects/:id/hooks` fails and returns a `403 Unauthorized` error it is
still possible to access a hook directly via `GET /projects/:id/hooks/:hook_id`.
Fixes access, also added tests to check access and status codes of hooks.
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