OSDN Git Service

wvm/gitlab.git
11 years agoProject issue tracker functions refactored
Andrew8xx8 [Mon, 11 Feb 2013 11:41:12 +0000 (15:41 +0400)]
Project issue tracker functions refactored

11 years agoIssue tracker added to edit project form in admin area
Andrew8xx8 [Fri, 8 Feb 2013 13:55:02 +0000 (17:55 +0400)]
Issue tracker added to edit project form in admin area

11 years agoIssue tracker field added to projects
Andrew8xx8 [Wed, 23 Jan 2013 14:13:28 +0000 (18:13 +0400)]
Issue tracker field added to projects

11 years agoEnumerize gem added
Andrew8xx8 [Fri, 8 Feb 2013 12:47:24 +0000 (16:47 +0400)]
Enumerize gem added

11 years agofixed popen test
Dmitriy Zaporozhets [Wed, 27 Feb 2013 06:24:12 +0000 (08:24 +0200)]
fixed popen test

11 years agomove transfer logic out of project to service
Dmitriy Zaporozhets [Tue, 26 Feb 2013 21:14:32 +0000 (23:14 +0200)]
move transfer logic out of project to service

11 years agoFix TestHookContext
Dmitriy Zaporozhets [Tue, 26 Feb 2013 21:04:14 +0000 (23:04 +0200)]
Fix TestHookContext

11 years agospecs for api/internal
Dmitriy Zaporozhets [Tue, 26 Feb 2013 20:53:59 +0000 (22:53 +0200)]
specs for api/internal

11 years agospecs for Gitlab::Popen
Dmitriy Zaporozhets [Tue, 26 Feb 2013 20:53:46 +0000 (22:53 +0200)]
specs for Gitlab::Popen

11 years agoremove tests for unexisting methods
Dmitriy Zaporozhets [Tue, 26 Feb 2013 09:17:02 +0000 (11:17 +0200)]
remove tests for unexisting methods

11 years agoremove unused code related to gitolite
Dmitriy Zaporozhets [Tue, 26 Feb 2013 09:11:43 +0000 (11:11 +0200)]
remove unused code related to gitolite

11 years agoemail validation added
Dmitriy Zaporozhets [Tue, 26 Feb 2013 09:09:32 +0000 (11:09 +0200)]
email validation added

11 years agoMerge branch 'Undev-state-machine-stage-2'
Dmitriy Zaporozhets [Tue, 26 Feb 2013 08:48:30 +0000 (10:48 +0200)]
Merge branch 'Undev-state-machine-stage-2'

11 years agoFix automerge detection client-side since #3056
Dmitriy Zaporozhets [Tue, 26 Feb 2013 08:47:27 +0000 (10:47 +0200)]
Fix automerge detection client-side since #3056

11 years agoMerge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev...
Dmitriy Zaporozhets [Tue, 26 Feb 2013 08:38:40 +0000 (10:38 +0200)]
Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2

Conflicts:
app/models/merge_request.rb

11 years agoMerge pull request #2889 from kennytm/master
Dmitriy Zaporozhets [Tue, 26 Feb 2013 08:32:02 +0000 (00:32 -0800)]
Merge pull request #2889 from kennytm/master

Show only ≤16 lines of codes in a discussion in a MR (issue #2860).

11 years agoFix issue edit button showup
Dmitriy Zaporozhets [Tue, 26 Feb 2013 08:17:09 +0000 (10:17 +0200)]
Fix issue edit button showup

11 years agoFixing tests
Dmitriy Zaporozhets [Mon, 25 Feb 2013 21:16:34 +0000 (23:16 +0200)]
Fixing tests

11 years agoAdd close issue to note actions bar
Dmitriy Zaporozhets [Mon, 25 Feb 2013 21:10:50 +0000 (23:10 +0200)]
Add close issue to note actions bar

11 years agoproper name for issue partial
Dmitriy Zaporozhets [Mon, 25 Feb 2013 20:56:10 +0000 (22:56 +0200)]
proper name for issue partial

11 years agoSanitize user profile input
Dmitriy Zaporozhets [Mon, 25 Feb 2013 20:51:15 +0000 (22:51 +0200)]
Sanitize user profile input

11 years agoSince search_autocomplete_source rendered with raw all human input should be sanitize...
Dmitriy Zaporozhets [Mon, 25 Feb 2013 20:12:11 +0000 (22:12 +0200)]
Since search_autocomplete_source rendered with raw all human input should be sanitized to prevent XSS

11 years agoRemove gitolite mention from docs
Dmitriy Zaporozhets [Mon, 25 Feb 2013 19:45:33 +0000 (21:45 +0200)]
Remove gitolite mention from docs

11 years agocorrect indentation in activity observer
Dmitriy Zaporozhets [Mon, 25 Feb 2013 19:26:15 +0000 (21:26 +0200)]
correct indentation in activity observer

11 years agoMove git post push logic to service
Dmitriy Zaporozhets [Mon, 25 Feb 2013 19:21:38 +0000 (21:21 +0200)]
Move git post push logic to service

11 years agoMerge pull request #3052 from Undev/system-hook-observer-improves
Dmitriy Zaporozhets [Mon, 25 Feb 2013 18:15:23 +0000 (10:15 -0800)]
Merge pull request #3052 from Undev/system-hook-observer-improves

System hooks code & logic refactoring

11 years agoMerge pull request #3057 from axilleas/master
Dmitriy Zaporozhets [Mon, 25 Feb 2013 18:11:52 +0000 (10:11 -0800)]
Merge pull request #3057 from axilleas/master

Remove function 'check_issue_1059_shell_profile_error' from check.rake as it is not needed anymore

11 years agoUpdate grit to handle symlinks
Dmitriy Zaporozhets [Mon, 25 Feb 2013 17:44:37 +0000 (19:44 +0200)]
Update grit to handle symlinks

11 years agoUpdate grit for ruby 2.0 support
Dmitriy Zaporozhets [Mon, 25 Feb 2013 17:22:46 +0000 (19:22 +0200)]
Update grit for ruby 2.0 support

11 years agoremove duplicate finder in features/steps/path
Dmitriy Zaporozhets [Mon, 25 Feb 2013 08:28:59 +0000 (10:28 +0200)]
remove duplicate finder in features/steps/path

11 years agoFix merge request migration for postgres
Dmitriy Zaporozhets [Mon, 25 Feb 2013 06:53:49 +0000 (08:53 +0200)]
Fix merge request migration for postgres

11 years agoMerge pull request #3071 from dmedvinsky/fix-webhook-auth
Dmitriy Zaporozhets [Sun, 24 Feb 2013 12:13:15 +0000 (04:13 -0800)]
Merge pull request #3071 from dmedvinsky/fix-webhook-auth

Fix WebHook and special symbols in credentials

11 years agoMerge pull request #3072 from dmedvinsky/add-title-remove-member
Dmitriy Zaporozhets [Sun, 24 Feb 2013 12:04:58 +0000 (04:04 -0800)]
Merge pull request #3072 from dmedvinsky/add-title-remove-member

Add title for "Remove from team" button

11 years agoMerge pull request #3073 from dmedvinsky/cosmetic-search-transition
Dmitriy Zaporozhets [Sun, 24 Feb 2013 12:03:16 +0000 (04:03 -0800)]
Merge pull request #3073 from dmedvinsky/cosmetic-search-transition

Add transition on search box

11 years agoAdd transition on search box
Dmitry Medvinsky [Fri, 22 Feb 2013 16:50:17 +0000 (20:50 +0400)]
Add transition on search box

It's kind of cool trend to use animated-expanding search box nowadays.
E.g. see Github.

11 years agoAdd title for "Remove from team" button
Dmitry Medvinsky [Fri, 22 Feb 2013 16:26:33 +0000 (20:26 +0400)]
Add title for "Remove from team" button

11 years agoFix WebHook and special symbols in credentials
Dmitry Medvinsky [Fri, 22 Feb 2013 16:03:59 +0000 (20:03 +0400)]
Fix WebHook and special symbols in credentials

When using web hook with credentials secured web resource, one needs to
put the credentials in the hook URL.

If the credentials contain special symbols (e.g. @ or #), it should be
URL-quoted (e.g. %40 instead of @).

But when Gitlab is making a request, it should unquote the symbols
before base64-encoding them.

11 years agoAdd new entries to CHANGELOG
Dmitriy Zaporozhets [Thu, 21 Feb 2013 15:01:02 +0000 (17:01 +0200)]
Add new entries to CHANGELOG

11 years agoRestore old order for MR lists. Fix failing tests
Dmitriy Zaporozhets [Thu, 21 Feb 2013 14:26:09 +0000 (16:26 +0200)]
Restore old order for MR lists. Fix failing tests

11 years agoFix merge request closed filter. Fixed one more test
Dmitriy Zaporozhets [Thu, 21 Feb 2013 12:11:24 +0000 (14:11 +0200)]
Fix merge request closed filter. Fixed one more test

11 years agoUpdate database cleaner. Remove postgres from travis build list since it gives us...
Dmitriy Zaporozhets [Thu, 21 Feb 2013 12:11:04 +0000 (14:11 +0200)]
Update database cleaner. Remove postgres from travis build list since it gives us deadlocks always

11 years agoRemoving ambiguity and non-working selectors
Dmitriy Zaporozhets [Thu, 21 Feb 2013 11:28:05 +0000 (13:28 +0200)]
Removing ambiguity and non-working selectors

11 years agoFixing rspec after upgrade to capybara pt1
Dmitriy Zaporozhets [Thu, 21 Feb 2013 11:09:47 +0000 (13:09 +0200)]
Fixing rspec after upgrade to capybara pt1

11 years agoFix ambiguity for member link in test
Dmitriy Zaporozhets [Thu, 21 Feb 2013 10:39:09 +0000 (12:39 +0200)]
Fix ambiguity for member link in test

11 years agoTeam features are green now
Dmitriy Zaporozhets [Thu, 21 Feb 2013 10:27:52 +0000 (12:27 +0200)]
Team features are green now

11 years agoAn Id must be sended to queue
Andrew8xx8 [Thu, 21 Feb 2013 10:04:06 +0000 (14:04 +0400)]
An Id must be sended to queue

11 years agoMonkeypatch satellite call for merge request in tests
Dmitriy Zaporozhets [Thu, 21 Feb 2013 09:44:33 +0000 (11:44 +0200)]
Monkeypatch satellite call for merge request in tests

11 years agoimprove selectors to pass capybara 2.0
Dmitriy Zaporozhets [Thu, 21 Feb 2013 09:27:22 +0000 (11:27 +0200)]
improve selectors to pass capybara 2.0

11 years agomove capybara scenarios to spec/features
Dmitriy Zaporozhets [Thu, 21 Feb 2013 08:41:37 +0000 (10:41 +0200)]
move capybara scenarios to spec/features

11 years agoAdd LoginHelpers to feature type
Dmitriy Zaporozhets [Thu, 21 Feb 2013 08:41:13 +0000 (10:41 +0200)]
Add LoginHelpers to feature type

11 years agoUpdate capybara, poltergeist, spinach, rspec-rails
Dmitriy Zaporozhets [Thu, 21 Feb 2013 08:28:13 +0000 (10:28 +0200)]
Update capybara, poltergeist, spinach, rspec-rails

11 years agoUpdate sidekiq
Dmitriy Zaporozhets [Thu, 21 Feb 2013 08:00:18 +0000 (10:00 +0200)]
Update sidekiq

11 years agoFix merge state detection
Dmitriy Zaporozhets [Thu, 21 Feb 2013 07:25:07 +0000 (09:25 +0200)]
Fix merge state detection

11 years agoWe don't need to check .profile now that gitolite is replaced by gitlab-shell
Axilleas Pipinellis [Wed, 20 Feb 2013 15:36:09 +0000 (17:36 +0200)]
We don't need to check .profile now that gitolite is replaced by gitlab-shell

11 years agohuman_merge_status replaced by human_merge_status_name
Andrew8xx8 [Wed, 20 Feb 2013 13:45:29 +0000 (17:45 +0400)]
human_merge_status replaced by human_merge_status_name

11 years agoclass.self methods moved to scopes
Andrew8xx8 [Wed, 20 Feb 2013 13:37:20 +0000 (17:37 +0400)]
class.self methods moved to scopes

11 years agoState machine added for merge_status field
Andrew8xx8 [Wed, 20 Feb 2013 13:15:01 +0000 (17:15 +0400)]
State machine added for merge_status field

11 years agoDatabase schema updated
Andrew8xx8 [Wed, 20 Feb 2013 13:13:42 +0000 (17:13 +0400)]
Database schema updated

11 years agoMigrations for convertion merge_status added
Andrew8xx8 [Wed, 20 Feb 2013 13:13:18 +0000 (17:13 +0400)]
Migrations for convertion merge_status added

11 years agoMerge pull request #3053 from m4tthumphrey/api-delete-hook-by-id
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

11 years agoRemoved unnecessary paramter hash. Also tidied up hash format in hook creation spec
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

11 years agoFix RESTfulness of project hook deletions by API
Matt Humphrey [Wed, 20 Feb 2013 11:35:36 +0000 (11:35 +0000)]
Fix RESTfulness of project hook deletions by API

11 years agoMethod moved to service
Andrew8xx8 [Wed, 20 Feb 2013 11:33:03 +0000 (15:33 +0400)]
Method moved to service

11 years agoSystem hooks execution moved to System hook service
Andrew8xx8 [Wed, 20 Feb 2013 10:53:15 +0000 (14:53 +0400)]
System hooks execution moved to System hook service

11 years agoMerge pull request #2988 from Asquera/error_project_limit
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

11 years agoMerge pull request #3011 from Asquera/fix_access_to_nonvisible_hook
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

11 years agoMerge pull request #3038 from dmedvinsky/commit-time
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`

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

11 years agoMerge pull request #3043 from sjmulder/state-seed
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

11 years agoA little bit of codestyle improvments
Andrew8xx8 [Wed, 20 Feb 2013 09:15:56 +0000 (13:15 +0400)]
A little bit of codestyle improvments

11 years agoAPI docs: fix new milestone parameters
Nihad Abbasov [Wed, 20 Feb 2013 07:41:32 +0000 (11:41 +0400)]
API docs: fix new milestone parameters

11 years agoUpdate doc/install/installation.md
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

11 years agoUpdate seeds for state columns
Sijmen Mulder [Tue, 19 Feb 2013 21:14:28 +0000 (22:14 +0100)]
Update seeds for state columns

11 years agoAdd commit full time tooltip to `commited_ago`
Dmitry Medvinsky [Tue, 19 Feb 2013 15:13:54 +0000 (19:13 +0400)]
Add commit full time tooltip to `commited_ago`

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

11 years agoEvent already has author relation
Andrew Kulakov [Tue, 19 Feb 2013 11:22:29 +0000 (15:22 +0400)]
Event already has author relation

11 years agoMerge pull request #3032 from raphendyr/fix_development_environment
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

11 years agoFix private flag for project
Dmitriy Zaporozhets [Tue, 19 Feb 2013 09:45:49 +0000 (11:45 +0200)]
Fix private flag for project

11 years agoFix development fixture for gitlab_shell
Jaakko Kantojärvi [Mon, 18 Feb 2013 16:03:29 +0000 (18:03 +0200)]
Fix development fixture for gitlab_shell

11 years agoMerge branch 'Undev-state-machine'
Dmitriy Zaporozhets [Tue, 19 Feb 2013 09:04:54 +0000 (11:04 +0200)]
Merge branch 'Undev-state-machine'

11 years agoMerge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state...
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

11 years agoJavascript widget fixed
Andrew8xx8 [Tue, 19 Feb 2013 08:57:09 +0000 (12:57 +0400)]
Javascript widget fixed

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

11 years agoFix project filter for MR on dashboard
Dmitriy Zaporozhets [Tue, 19 Feb 2013 07:43:41 +0000 (09:43 +0200)]
Fix project filter for MR on dashboard

11 years agoMigrations iproved
Andrew8xx8 [Tue, 19 Feb 2013 07:32:10 +0000 (11:32 +0400)]
Migrations iproved

11 years agoSyntax fix of sorting groups/users
Dmitry Moskalchuk [Tue, 19 Feb 2013 07:13:19 +0000 (11:13 +0400)]
Syntax fix of sorting groups/users

11 years agoDont show assigned_teams block unless any. Show count in filter
Dmitriy Zaporozhets [Mon, 18 Feb 2013 19:21:24 +0000 (21:21 +0200)]
Dont show assigned_teams block unless any. Show count in filter

11 years agoRefactor and restyle team page for project
Dmitriy Zaporozhets [Mon, 18 Feb 2013 19:10:49 +0000 (21:10 +0200)]
Refactor and restyle team page for project

11 years agono projects message in group area
Dmitriy Zaporozhets [Mon, 18 Feb 2013 18:31:43 +0000 (20:31 +0200)]
no projects message in group area

11 years agoMerge pull request #2998 from axilleas/master
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.

11 years agoMerge pull request #2990 from raphendyr/gitignore_and_logrotate
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.

11 years agoMerge pull request #2991 from raphendyr/username_change_disablation
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

11 years agoMerge pull request #2996 from raphendyr/ssh_fingerprint_fix
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

11 years agoMigrations refactored ro support data convertion
Andrew8xx8 [Mon, 18 Feb 2013 14:54:30 +0000 (18:54 +0400)]
Migrations refactored ro support data convertion

11 years agoFix not-working team memebership permissions change
Dmitriy Zaporozhets [Mon, 18 Feb 2013 14:40:11 +0000 (16:40 +0200)]
Fix not-working team memebership permissions change

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