OSDN Git Service

wvm/gitlab.git
11 years agoPass project into factory for teams tests
Dmitriy Zaporozhets [Mon, 1 Apr 2013 17:35:41 +0000 (20:35 +0300)]
Pass project into factory for teams tests

11 years agofixed test using repo with commits but old factory
Dmitriy Zaporozhets [Mon, 1 Apr 2013 16:06:47 +0000 (19:06 +0300)]
fixed test using repo with commits but old factory

11 years agofix tests
Dmitriy Zaporozhets [Mon, 1 Apr 2013 15:35:29 +0000 (18:35 +0300)]
fix tests

11 years agofix facotries
Dmitriy Zaporozhets [Mon, 1 Apr 2013 15:24:05 +0000 (18:24 +0300)]
fix facotries

11 years agoUse project_with_code factory where necessary
Dmitriy Zaporozhets [Mon, 1 Apr 2013 15:16:08 +0000 (18:16 +0300)]
Use project_with_code factory where necessary

11 years agoDont init repo on every create(:repo)
Dmitriy Zaporozhets [Mon, 1 Apr 2013 14:27:44 +0000 (17:27 +0300)]
Dont init repo on every create(:repo)

11 years agoProject.repository should never be nil so you can call repository.exists? or reposito...
Dmitriy Zaporozhets [Mon, 1 Apr 2013 13:56:25 +0000 (16:56 +0300)]
Project.repository should never be nil so you can call repository.exists? or repository.empty?
Also specify separate project factory for project with filled repo

11 years agoUse Gitlab::Git:: for git features across application
Dmitriy Zaporozhets [Mon, 1 Apr 2013 13:04:35 +0000 (16:04 +0300)]
Use Gitlab::Git:: for git features across application

11 years agoadded Gitlab::Git::Compare for git compare feature
Dmitriy Zaporozhets [Mon, 1 Apr 2013 13:03:11 +0000 (16:03 +0300)]
added Gitlab::Git::Compare for git compare feature

11 years agoadded Gitlab::Git::Blame for git blame feature
Dmitriy Zaporozhets [Mon, 1 Apr 2013 13:02:54 +0000 (16:02 +0300)]
added Gitlab::Git::Blame for git blame feature

11 years agodefine TestEnv and keep all global stubs in one place
Dmitriy Zaporozhets [Mon, 1 Apr 2013 11:39:19 +0000 (14:39 +0300)]
define TestEnv and keep all global stubs in one place

11 years agoFix stubbed repo
Dmitriy Zaporozhets [Mon, 1 Apr 2013 06:21:31 +0000 (09:21 +0300)]
Fix stubbed repo

11 years agoremove unnecessary Commit.new
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:58:17 +0000 (23:58 +0300)]
remove unnecessary Commit.new

11 years agoExtend models functionality with old decorator methods. Use Repository model
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:48:12 +0000 (23:48 +0300)]
Extend models functionality with old decorator methods. Use Repository model

11 years agoRemove decorator calls and methods from views. Repalace with helper calls when needed
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:47:26 +0000 (23:47 +0300)]
Remove decorator calls and methods from views. Repalace with helper calls when needed

11 years agoMove some decorator logic to helpers
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:46:54 +0000 (23:46 +0300)]
Move some decorator logic to helpers

11 years agoremove Tree/Commit decorator usage from controllers
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:46:25 +0000 (23:46 +0300)]
remove Tree/Commit decorator usage from controllers

11 years agorake task to clear redis cache
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:45:58 +0000 (23:45 +0300)]
rake task to clear redis cache

11 years agoAdd Repository model to proxy request to Gitlab::Git::Repositoty and decorate commits...
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:45:38 +0000 (23:45 +0300)]
Add Repository model to proxy request to Gitlab::Git::Repositoty and decorate commits with Commit model

11 years agoRemove Commit & Tree decorators
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:44:59 +0000 (23:44 +0300)]
Remove Commit & Tree decorators

11 years agoDecorate Gitlab::Git::Commit with Commit
Dmitriy Zaporozhets [Sun, 31 Mar 2013 16:00:45 +0000 (19:00 +0300)]
Decorate Gitlab::Git::Commit with Commit

11 years agoFix tests and remove app/models/repository.rb
Dmitriy Zaporozhets [Sun, 31 Mar 2013 15:50:17 +0000 (18:50 +0300)]
Fix tests and remove app/models/repository.rb

11 years agoRemove grit logic from app/
Dmitriy Zaporozhets [Sun, 31 Mar 2013 15:49:58 +0000 (18:49 +0300)]
Remove grit logic from app/

11 years agospecs for Gitlab::Git::Repository and Gitlab::Git::Commit
Dmitriy Zaporozhets [Sun, 31 Mar 2013 15:49:31 +0000 (18:49 +0300)]
specs for Gitlab::Git::Repository and Gitlab::Git::Commit

11 years agoMove Commit and Repository logic to lib/gitlab/git
Dmitriy Zaporozhets [Sun, 31 Mar 2013 15:49:06 +0000 (18:49 +0300)]
Move Commit and Repository logic to lib/gitlab/git

11 years agoUse existing methods for branch names: Ex use @repository.branch_names instead of...
Dmitriy Zaporozhets [Sun, 31 Mar 2013 14:08:10 +0000 (17:08 +0300)]
Use existing methods for branch names: Ex use @repository.branch_names instead of @repository.heads.map(&:name)

11 years agoMerge branch 'header-in-contributing-guide' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 31 Mar 2013 12:06:48 +0000 (12:06 +0000)]
Merge branch 'header-in-contributing-guide' of /home/git/repositories/gitlab/gitlabhq

11 years agoMerge branch 'notes-in-installation-guide' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 31 Mar 2013 12:06:24 +0000 (12:06 +0000)]
Merge branch 'notes-in-installation-guide' of /home/git/repositories/gitlab/gitlabhq

11 years agoFix therubyracer dependencies
Dmitriy Zaporozhets [Sun, 31 Mar 2013 12:04:08 +0000 (15:04 +0300)]
Fix therubyracer dependencies

11 years agoSection for important notes.
Sytse Sijbrandij [Sun, 31 Mar 2013 11:54:46 +0000 (13:54 +0200)]
Section for important notes.

11 years agoImprove header and wording.
Sytse Sijbrandij [Sun, 31 Mar 2013 11:48:49 +0000 (13:48 +0200)]
Improve header and wording.

11 years agoMerge pull request #3457 from jrmithdobbs/fix-freebsd-bundle-install
Dmitriy Zaporozhets [Sun, 31 Mar 2013 08:32:33 +0000 (01:32 -0700)]
Merge pull request #3457 from jrmithdobbs/fix-freebsd-bundle-install

Update deps for therubyracer and libv8 resolve build issues on FreeBSD...

11 years agoUpdate deps for therubyracer and libv8 to resolve build issues on FreeBSD. Resolves...
Douglas Huff [Sun, 31 Mar 2013 01:54:12 +0000 (18:54 -0700)]
Update deps for therubyracer and libv8 to resolve build issues on FreeBSD. Resolves Iussue#3446 .

11 years agoMerge pull request #3369 from hiroponz/display-note-count
Dmitriy Zaporozhets [Sat, 30 Mar 2013 22:10:26 +0000 (15:10 -0700)]
Merge pull request #3369 from hiroponz/display-note-count

Display note count on network graph.

11 years agoMerge pull request #3396 from Andrew8xx8/issue-button-fix
Dmitriy Zaporozhets [Sat, 30 Mar 2013 22:10:08 +0000 (15:10 -0700)]
Merge pull request #3396 from Andrew8xx8/issue-button-fix

New issue button was not follows to external tracker if it is selected. ...

11 years agoMerge pull request #3392 from hiroponz/fix-non-ascii-char-username
Dmitriy Zaporozhets [Sat, 30 Mar 2013 22:07:11 +0000 (15:07 -0700)]
Merge pull request #3392 from hiroponz/fix-non-ascii-char-username

Fix RoutingError when changing username to non ascii char.

11 years agoMerge pull request #3430 from logorrhea/master
Dmitriy Zaporozhets [Sat, 30 Mar 2013 22:05:29 +0000 (15:05 -0700)]
Merge pull request #3430 from logorrhea/master

Changed the word 'authentification' to 'authentication'

11 years agoMerge pull request #3428 from colindean/bug/assigned-team-typo
Dmitriy Zaporozhets [Sat, 30 Mar 2013 22:04:32 +0000 (15:04 -0700)]
Merge pull request #3428 from colindean/bug/assigned-team-typo

fix typo: shure -> sure

11 years agoMerge pull request #3406 from docwhat/in_projects
Dmitriy Zaporozhets [Sat, 30 Mar 2013 22:03:44 +0000 (15:03 -0700)]
Merge pull request #3406 from docwhat/in_projects

Fixed UsersProject.in_projects

11 years agoprevent exception when trying to edit empty project
Dmitriy Zaporozhets [Sat, 30 Mar 2013 14:46:56 +0000 (16:46 +0200)]
prevent exception when trying to edit empty project

11 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sat, 30 Mar 2013 14:36:15 +0000 (16:36 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

11 years agouse rollbacked version of grit to make gollum works
Dmitriy Zaporozhets [Sat, 30 Mar 2013 14:33:26 +0000 (16:33 +0200)]
use rollbacked version of grit to make gollum works

11 years agoslower animation for tree browsing
Dmitriy Zaporozhets [Sat, 30 Mar 2013 11:23:58 +0000 (13:23 +0200)]
slower animation for tree browsing

11 years agoMerge branch 'accepting-mr-in-uservoice' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 30 Mar 2013 11:15:55 +0000 (11:15 +0000)]
Merge branch 'accepting-mr-in-uservoice' of /home/git/repositories/gitlab/gitlabhq

11 years agoMerge pull request #3440 from evanwon/patch-2
Dmitriy Zaporozhets [Sat, 30 Mar 2013 11:06:06 +0000 (04:06 -0700)]
Merge pull request #3440 from evanwon/patch-2

Fixed: gitlab-shell version check error message

11 years agoUpdate a grit to newer version
Dmitriy Zaporozhets [Sat, 30 Mar 2013 10:50:44 +0000 (12:50 +0200)]
Update a grit to newer version

11 years agoRemoving duplication by putting everything in the readme. Allow us to close issues...
Sytse Sijbrandij [Sat, 30 Mar 2013 10:35:35 +0000 (11:35 +0100)]
Removing duplication by putting everything in the readme. Allow us to close issues that deviate from the guidelines.

11 years agoPrevent gollum to overrride gitlab-grit gem. Use grit as instead so gollum uses it...
Dmitriy Zaporozhets [Fri, 29 Mar 2013 06:47:14 +0000 (08:47 +0200)]
Prevent gollum to overrride gitlab-grit gem. Use grit as instead so gollum uses it too. Fixes things with gpg singatured commits, etc.

11 years agoRevert "First step with rugged"
Dmitriy Zaporozhets [Thu, 28 Mar 2013 21:01:42 +0000 (23:01 +0200)]
Revert "First step with rugged"

This reverts commit 4524ba20b804dacccbaca3c37e781adc82c5e0d3.

11 years agoFirst step with rugged
Dmitriy Zaporozhets [Thu, 28 Mar 2013 19:57:38 +0000 (21:57 +0200)]
First step with rugged

11 years agoFixed: gitlab-shell version check error message
Evan Wondrasek [Thu, 28 Mar 2013 16:03:00 +0000 (11:03 -0500)]
Fixed: gitlab-shell version check error message

11 years agorefactor wall.js. style wall page a bit
Dmitriy Zaporozhets [Thu, 28 Mar 2013 14:41:29 +0000 (16:41 +0200)]
refactor wall.js. style wall page a bit

11 years agoFix Note notification for entities without assignee
Dmitriy Zaporozhets [Thu, 28 Mar 2013 14:00:19 +0000 (16:00 +0200)]
Fix Note notification for entities without assignee

11 years agoremove notify checkboxes from note forms
Dmitriy Zaporozhets [Thu, 28 Mar 2013 13:39:18 +0000 (15:39 +0200)]
remove notify checkboxes from note forms

11 years agoinslude author & assignee to note notification recipients
Dmitriy Zaporozhets [Thu, 28 Mar 2013 12:51:25 +0000 (14:51 +0200)]
inslude author & assignee to note notification recipients

11 years agorebuild notification on notes logic
Dmitriy Zaporozhets [Thu, 28 Mar 2013 12:39:59 +0000 (14:39 +0200)]
rebuild notification on notes logic

11 years agoFix notify specs. Fix merge request close via api
Dmitriy Zaporozhets [Thu, 28 Mar 2013 11:24:01 +0000 (13:24 +0200)]
Fix notify specs. Fix merge request close via api

11 years agoFixed new mr/issue emails
Dmitriy Zaporozhets [Thu, 28 Mar 2013 10:52:44 +0000 (12:52 +0200)]
Fixed new mr/issue emails

11 years agoadd text templates to new emails
Dmitriy Zaporozhets [Thu, 28 Mar 2013 10:33:54 +0000 (12:33 +0200)]
add text templates to new emails

11 years agoImprove notification service tests
Dmitriy Zaporozhets [Thu, 28 Mar 2013 10:24:04 +0000 (12:24 +0200)]
Improve notification service tests

11 years agoAdd close issue/mr methods to Notify. Refactored Notificationservice
Dmitriy Zaporozhets [Thu, 28 Mar 2013 10:14:53 +0000 (12:14 +0200)]
Add close issue/mr methods to Notify. Refactored Notificationservice

11 years agoadd watchers to email recipients list. Add emails for close/merge MR
Dmitriy Zaporozhets [Thu, 28 Mar 2013 09:59:06 +0000 (11:59 +0200)]
add watchers to email recipients list. Add emails for close/merge MR

11 years agoChanged the word 'authentification' to 'authentication'
Tyler Funk [Thu, 28 Mar 2013 03:03:54 +0000 (22:03 -0500)]
Changed the word 'authentification' to 'authentication'

11 years agoFix NotificationService reassign_email method
Dmitriy Zaporozhets [Wed, 27 Mar 2013 20:33:59 +0000 (22:33 +0200)]
Fix NotificationService reassign_email method

11 years agoUpdate develoment dependencies
Dmitriy Zaporozhets [Wed, 27 Mar 2013 20:21:32 +0000 (22:21 +0200)]
Update develoment dependencies

11 years agofix typo: shure -> sure
Colin Dean [Wed, 27 Mar 2013 19:55:10 +0000 (15:55 -0400)]
fix typo: shure -> sure

11 years agoupdate sidekiq
Dmitriy Zaporozhets [Wed, 27 Mar 2013 19:51:40 +0000 (21:51 +0200)]
update sidekiq

11 years agoFix NotificationService NameError for new issue
Dmitriy Zaporozhets [Wed, 27 Mar 2013 19:42:01 +0000 (21:42 +0200)]
Fix NotificationService NameError for new issue

11 years agoNotificationService respects disabled notifications now
Dmitriy Zaporozhets [Wed, 27 Mar 2013 18:28:00 +0000 (20:28 +0200)]
NotificationService respects disabled notifications now

11 years agoPrepare UI for notification settings
Dmitriy Zaporozhets [Wed, 27 Mar 2013 18:07:52 +0000 (20:07 +0200)]
Prepare UI for notification settings

11 years agonotification scaffold
Dmitriy Zaporozhets [Wed, 27 Mar 2013 17:04:29 +0000 (19:04 +0200)]
notification scaffold

11 years agoannotated
Dmitriy Zaporozhets [Wed, 27 Mar 2013 16:26:37 +0000 (18:26 +0200)]
annotated

11 years agoLink to accepting issues on feedback forum.
Sytse Sijbrandij [Wed, 27 Mar 2013 09:15:12 +0000 (10:15 +0100)]
Link to accepting issues on feedback forum.

11 years agoMerge pull request #3407 from NARKOZ/patch-1
Dmitriy Zaporozhets [Wed, 27 Mar 2013 06:28:07 +0000 (23:28 -0700)]
Merge pull request #3407 from NARKOZ/patch-1

use convenient method to check for empty project repo

11 years agostub notification in event model
Dmitriy Zaporozhets [Tue, 26 Mar 2013 17:27:39 +0000 (19:27 +0200)]
stub notification in event model

11 years agoSettings replaced by Gitlab.config
Andrew8xx8 [Tue, 26 Mar 2013 17:04:00 +0000 (21:04 +0400)]
Settings replaced by Gitlab.config

11 years agorefactor observers test since email logic moved to service
Dmitriy Zaporozhets [Tue, 26 Mar 2013 17:00:54 +0000 (19:00 +0200)]
refactor observers test since email logic moved to service

11 years agorefactor observers. Added BaseObserver with helper methods
Dmitriy Zaporozhets [Tue, 26 Mar 2013 16:11:38 +0000 (18:11 +0200)]
refactor observers. Added BaseObserver with helper methods

11 years agoMove new_note email logic to NotificationService
Dmitriy Zaporozhets [Tue, 26 Mar 2013 15:51:06 +0000 (17:51 +0200)]
Move new_note email logic to NotificationService

11 years agoUse notificationService for MR reassigned
Dmitriy Zaporozhets [Tue, 26 Mar 2013 15:23:28 +0000 (17:23 +0200)]
Use notificationService for MR reassigned

11 years agouse NotificationService for handle notify logic when MR created
Dmitriy Zaporozhets [Tue, 26 Mar 2013 15:16:06 +0000 (17:16 +0200)]
use NotificationService for handle notify logic when MR created

11 years agoFixed UsersProject.in_projects
Christian Höltje [Tue, 26 Mar 2013 14:19:55 +0000 (10:19 -0400)]
Fixed UsersProject.in_projects

I discovered while trying to use UserTeam#remove_member() that
UsersProject.in_projects was broken.  So I wrote test cases to test what
I was trying to do and fixed the underlying problem.

11 years agouse convenient method to check for empty project repo
Nihad Abbasov [Tue, 26 Mar 2013 14:14:57 +0000 (07:14 -0700)]
use convenient method to check for empty project repo

11 years agoMerge pull request #3398 from Andrew8xx8/spork
Dmitriy Zaporozhets [Tue, 26 Mar 2013 13:44:52 +0000 (06:44 -0700)]
Merge pull request #3398 from Andrew8xx8/spork

Spork support added

11 years agoenable callbacks for specs after notification
Dmitriy Zaporozhets [Tue, 26 Mar 2013 13:16:06 +0000 (15:16 +0200)]
enable callbacks for specs after notification

11 years agorefactor issue observer spec
Dmitriy Zaporozhets [Tue, 26 Mar 2013 12:41:57 +0000 (14:41 +0200)]
refactor issue observer spec

11 years agoSpork support added
Andrew8xx8 [Tue, 26 Mar 2013 09:13:30 +0000 (13:13 +0400)]
Spork support added

11 years agofixed tests
Dmitriy Zaporozhets [Tue, 26 Mar 2013 09:17:49 +0000 (11:17 +0200)]
fixed tests

11 years agoreject current_user from close issue emails
Dmitriy Zaporozhets [Tue, 26 Mar 2013 09:06:24 +0000 (11:06 +0200)]
reject current_user from close issue emails

11 years agonotification level for user
Dmitriy Zaporozhets [Tue, 26 Mar 2013 08:16:49 +0000 (10:16 +0200)]
notification level for user

11 years agoNotificationService for resolving email notification logic
Dmitriy Zaporozhets [Tue, 26 Mar 2013 07:48:13 +0000 (09:48 +0200)]
NotificationService for resolving email notification logic

11 years agoUse NotificationService for observers pt1
Dmitriy Zaporozhets [Tue, 26 Mar 2013 07:47:40 +0000 (09:47 +0200)]
Use NotificationService for observers pt1

11 years agoUpdating based on Dmitriy his comments.
Sytse Sijbrandij [Sun, 24 Mar 2013 21:23:28 +0000 (22:23 +0100)]
Updating based on Dmitriy his comments.

11 years agoBetter header and detail why you need two times the storage. Also moving memory and...
Sytse Sijbrandij [Sun, 24 Mar 2013 10:02:39 +0000 (11:02 +0100)]
Better header and detail why you need two times the storage. Also moving memory and storage to the bottom, OS is more important.

11 years agoCorrected mistake, added hint for windows users.
Sytse Sijbrandij [Sat, 23 Mar 2013 20:38:51 +0000 (21:38 +0100)]
Corrected mistake, added hint for windows users.

11 years agoCombine it with the memory requirements that where already there.
Sytse Sijbrandij [Sat, 23 Mar 2013 20:34:45 +0000 (21:34 +0100)]
Combine it with the memory requirements that where already there.

11 years agoAdded memory requirements based on https://news.ycombinator.com/item?id=5423851
Sytse Sijbrandij [Sat, 23 Mar 2013 14:56:29 +0000 (15:56 +0100)]
Added memory requirements based on https://news.ycombinator.com/item?id=5423851

11 years agoNew issue button was not follows to external tracker if it is selected. fixed #3386
Andrew8xx8 [Tue, 26 Mar 2013 08:27:34 +0000 (12:27 +0400)]
New issue button was not follows to external tracker if it is selected. fixed #3386

11 years agoFix RoutingError when changing username to non ascii char.
Sato Hiroyuki [Tue, 26 Mar 2013 05:42:08 +0000 (14:42 +0900)]
Fix RoutingError when changing username to non ascii char.

11 years agoDisplay note count on network graph.
Sato Hiroyuki [Tue, 26 Mar 2013 00:51:39 +0000 (09:51 +0900)]
Display note count on network graph.