OSDN Git Service
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.
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'
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
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
Dmitriy Zaporozhets [Sat, 30 Mar 2013 14:46:56 +0000 (16:46 +0200)]
prevent exception when trying to edit empty project
Dmitriy Zaporozhets [Sat, 30 Mar 2013 14:36:15 +0000 (16:36 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sat, 30 Mar 2013 14:33:26 +0000 (16:33 +0200)]
use rollbacked version of grit to make gollum works
Dmitriy Zaporozhets [Sat, 30 Mar 2013 11:23:58 +0000 (13:23 +0200)]
slower animation for tree browsing
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
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
Dmitriy Zaporozhets [Sat, 30 Mar 2013 10:50:44 +0000 (12:50 +0200)]
Update a grit to newer version
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.
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.
Dmitriy Zaporozhets [Thu, 28 Mar 2013 21:01:42 +0000 (23:01 +0200)]
Revert "First step with rugged"
This reverts commit
4524ba20b804dacccbaca3c37e781adc82c5e0d3.
Dmitriy Zaporozhets [Thu, 28 Mar 2013 19:57:38 +0000 (21:57 +0200)]
First step with rugged
Evan Wondrasek [Thu, 28 Mar 2013 16:03:00 +0000 (11:03 -0500)]
Fixed: gitlab-shell version check error message
Dmitriy Zaporozhets [Thu, 28 Mar 2013 14:41:29 +0000 (16:41 +0200)]
refactor wall.js. style wall page a bit
Dmitriy Zaporozhets [Thu, 28 Mar 2013 14:00:19 +0000 (16:00 +0200)]
Fix Note notification for entities without assignee
Dmitriy Zaporozhets [Thu, 28 Mar 2013 13:39:18 +0000 (15:39 +0200)]
remove notify checkboxes from note forms
Dmitriy Zaporozhets [Thu, 28 Mar 2013 12:51:25 +0000 (14:51 +0200)]
inslude author & assignee to note notification recipients
Dmitriy Zaporozhets [Thu, 28 Mar 2013 12:39:59 +0000 (14:39 +0200)]
rebuild notification on notes logic
Dmitriy Zaporozhets [Thu, 28 Mar 2013 11:24:01 +0000 (13:24 +0200)]
Fix notify specs. Fix merge request close via api
Dmitriy Zaporozhets [Thu, 28 Mar 2013 10:52:44 +0000 (12:52 +0200)]
Fixed new mr/issue emails
Dmitriy Zaporozhets [Thu, 28 Mar 2013 10:33:54 +0000 (12:33 +0200)]
add text templates to new emails
Dmitriy Zaporozhets [Thu, 28 Mar 2013 10:24:04 +0000 (12:24 +0200)]
Improve notification service tests
Dmitriy Zaporozhets [Thu, 28 Mar 2013 10:14:53 +0000 (12:14 +0200)]
Add close issue/mr methods to Notify. Refactored Notificationservice
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
Tyler Funk [Thu, 28 Mar 2013 03:03:54 +0000 (22:03 -0500)]
Changed the word 'authentification' to 'authentication'
Dmitriy Zaporozhets [Wed, 27 Mar 2013 20:33:59 +0000 (22:33 +0200)]
Fix NotificationService reassign_email method
Dmitriy Zaporozhets [Wed, 27 Mar 2013 20:21:32 +0000 (22:21 +0200)]
Update develoment dependencies
Colin Dean [Wed, 27 Mar 2013 19:55:10 +0000 (15:55 -0400)]
fix typo: shure -> sure
Dmitriy Zaporozhets [Wed, 27 Mar 2013 19:51:40 +0000 (21:51 +0200)]
update sidekiq
Dmitriy Zaporozhets [Wed, 27 Mar 2013 19:42:01 +0000 (21:42 +0200)]
Fix NotificationService NameError for new issue
Dmitriy Zaporozhets [Wed, 27 Mar 2013 18:28:00 +0000 (20:28 +0200)]
NotificationService respects disabled notifications now
Dmitriy Zaporozhets [Wed, 27 Mar 2013 18:07:52 +0000 (20:07 +0200)]
Prepare UI for notification settings
Dmitriy Zaporozhets [Wed, 27 Mar 2013 17:04:29 +0000 (19:04 +0200)]
notification scaffold
Dmitriy Zaporozhets [Wed, 27 Mar 2013 16:26:37 +0000 (18:26 +0200)]
annotated
Sytse Sijbrandij [Wed, 27 Mar 2013 09:15:12 +0000 (10:15 +0100)]
Link to accepting issues on feedback forum.
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
Dmitriy Zaporozhets [Tue, 26 Mar 2013 17:27:39 +0000 (19:27 +0200)]
stub notification in event model
Dmitriy Zaporozhets [Tue, 26 Mar 2013 17:00:54 +0000 (19:00 +0200)]
refactor observers test since email logic moved to service
Dmitriy Zaporozhets [Tue, 26 Mar 2013 16:11:38 +0000 (18:11 +0200)]
refactor observers. Added BaseObserver with helper methods
Dmitriy Zaporozhets [Tue, 26 Mar 2013 15:51:06 +0000 (17:51 +0200)]
Move new_note email logic to NotificationService
Dmitriy Zaporozhets [Tue, 26 Mar 2013 15:23:28 +0000 (17:23 +0200)]
Use notificationService for MR reassigned
Dmitriy Zaporozhets [Tue, 26 Mar 2013 15:16:06 +0000 (17:16 +0200)]
use NotificationService for handle notify logic when MR created
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.
Nihad Abbasov [Tue, 26 Mar 2013 14:14:57 +0000 (07:14 -0700)]
use convenient method to check for empty project repo
Dmitriy Zaporozhets [Tue, 26 Mar 2013 13:44:52 +0000 (06:44 -0700)]
Merge pull request #3398 from Andrew8xx8/spork
Spork support added
Dmitriy Zaporozhets [Tue, 26 Mar 2013 13:16:06 +0000 (15:16 +0200)]
enable callbacks for specs after notification
Dmitriy Zaporozhets [Tue, 26 Mar 2013 12:41:57 +0000 (14:41 +0200)]
refactor issue observer spec
Andrew8xx8 [Tue, 26 Mar 2013 09:13:30 +0000 (13:13 +0400)]
Spork support added
Dmitriy Zaporozhets [Tue, 26 Mar 2013 09:17:49 +0000 (11:17 +0200)]
fixed tests
Dmitriy Zaporozhets [Tue, 26 Mar 2013 09:06:24 +0000 (11:06 +0200)]
reject current_user from close issue emails
Dmitriy Zaporozhets [Tue, 26 Mar 2013 08:16:49 +0000 (10:16 +0200)]
notification level for user
Dmitriy Zaporozhets [Tue, 26 Mar 2013 07:48:13 +0000 (09:48 +0200)]
NotificationService for resolving email notification logic
Dmitriy Zaporozhets [Tue, 26 Mar 2013 07:47:40 +0000 (09:47 +0200)]
Use NotificationService for observers pt1
Sytse Sijbrandij [Sun, 24 Mar 2013 21:23:28 +0000 (22:23 +0100)]
Updating based on Dmitriy his comments.
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.
Sytse Sijbrandij [Sat, 23 Mar 2013 20:38:51 +0000 (21:38 +0100)]
Corrected mistake, added hint for windows users.
Sytse Sijbrandij [Sat, 23 Mar 2013 20:34:45 +0000 (21:34 +0100)]
Combine it with the memory requirements that where already there.
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
Sato Hiroyuki [Tue, 26 Mar 2013 05:42:08 +0000 (14:42 +0900)]
Fix RoutingError when changing username to non ascii char.
Dmitriy Zaporozhets [Mon, 25 Mar 2013 18:55:20 +0000 (11:55 -0700)]
Merge pull request #3377 from SaitoWu/grit_ext
bump version of grit_ext
Saito [Mon, 25 Mar 2013 17:12:29 +0000 (01:12 +0800)]
bump version of grit_ext
Dmitriy Zaporozhets [Mon, 25 Mar 2013 14:12:12 +0000 (16:12 +0200)]
Update changelog
Dmitriy Zaporozhets [Mon, 25 Mar 2013 14:10:30 +0000 (16:10 +0200)]
Merge branch 'feature/login_with_username'
Dmitriy Zaporozhets [Mon, 25 Mar 2013 14:10:14 +0000 (16:10 +0200)]
login with both email or username
Dmitriy Zaporozhets [Mon, 25 Mar 2013 13:52:54 +0000 (15:52 +0200)]
try to move wiki if it does not exist
Dmitriy Zaporozhets [Mon, 25 Mar 2013 13:27:09 +0000 (15:27 +0200)]
Updated changelog with transfer & security changes
Dmitriy Zaporozhets [Mon, 25 Mar 2013 13:20:42 +0000 (15:20 +0200)]
Merge branch 'improve/project_transfer'
Dmitriy Zaporozhets [Mon, 25 Mar 2013 13:19:06 +0000 (15:19 +0200)]
require gitlab-shell v1.2.0 now
Dmitriy Zaporozhets [Mon, 25 Mar 2013 12:58:43 +0000 (14:58 +0200)]
Admin.projects: remove views and route specs
Dmitriy Zaporozhets [Mon, 25 Mar 2013 11:40:08 +0000 (13:40 +0200)]
Updatev security tests since admin is a superuser now. Has access to any project
Dmitriy Zaporozhets [Mon, 25 Mar 2013 11:36:08 +0000 (13:36 +0200)]
Removed not relevant tests for admin.projects
Dmitriy Zaporozhets [Mon, 25 Mar 2013 09:07:11 +0000 (11:07 +0200)]
remove project edit from admin area. Redesigned project page in admin area
Dmitriy Zaporozhets [Mon, 25 Mar 2013 08:48:30 +0000 (10:48 +0200)]
Make transfer action in project controller
Dmitriy Zaporozhets [Mon, 25 Mar 2013 08:47:47 +0000 (10:47 +0200)]
transfer also wiki repository when transfer a project
Dmitriy Zaporozhets [Mon, 25 Mar 2013 08:47:22 +0000 (10:47 +0200)]
Use TransferContext for project
Dmitriy Zaporozhets [Mon, 25 Mar 2013 08:46:57 +0000 (10:46 +0200)]
add admin ability to edit project settings from project area
Riyad Preukschas [Mon, 25 Mar 2013 07:49:19 +0000 (00:49 -0700)]
Merge pull request #3354 from vinodc/install-docs-typo-fix
Fixing a minor typo in the installation docs
Dmitriy Zaporozhets [Mon, 25 Mar 2013 07:39:23 +0000 (07:39 +0000)]
Merge branch 'more-links-in-readme' of /home/git/repositories/gitlab/gitlabhq
Vinod Chandru [Mon, 25 Mar 2013 03:23:02 +0000 (20:23 -0700)]
Fixing a minor typo in the installation docs
Dmitriy Zaporozhets [Sun, 24 Mar 2013 10:44:14 +0000 (03:44 -0700)]
Merge pull request #3335 from zzet/patch-4
Update databases.md
Andrew Kumanyaev [Sun, 24 Mar 2013 10:10:32 +0000 (14:10 +0400)]
Update database.yml.postgresql
Dmitriy Zaporozhets [Sun, 24 Mar 2013 10:01:56 +0000 (12:01 +0200)]
Merge branch 'hiroponz-fix-404-json-file'
Dmitriy Zaporozhets [Sun, 24 Mar 2013 09:57:44 +0000 (11:57 +0200)]
move edit to separate controller. This fixes #3265
Andrew Kumanyaev [Sun, 24 Mar 2013 09:48:23 +0000 (13:48 +0400)]
Update databases.md
Dmitriy Zaporozhets [Sun, 24 Mar 2013 09:26:57 +0000 (11:26 +0200)]
Merge branch 'fix-404-json-file' of https://github.com/hiroponz/gitlabhq into hiroponz-fix-404-json-file
Dmitriy Zaporozhets [Sun, 24 Mar 2013 09:24:26 +0000 (11:24 +0200)]
security update of crack gem
Sytse Sijbrandij [Sat, 23 Mar 2013 20:20:09 +0000 (21:20 +0100)]
Updated links to gitlab.com and added the last doc files.
Sytse Sijbrandij [Sat, 23 Mar 2013 20:06:00 +0000 (21:06 +0100)]
spelling error
Sytse Sijbrandij [Sat, 23 Mar 2013 20:05:42 +0000 (21:05 +0100)]
5.0 should no longer be on the roadmap
Dmitriy Zaporozhets [Fri, 22 Mar 2013 18:04:00 +0000 (11:04 -0700)]
Merge pull request #3305 from dosire/update-ruby
Update ruby to latest version.
Sytse Sijbrandij [Fri, 22 Mar 2013 17:34:59 +0000 (18:34 +0100)]
Update ruby to latest version.
Dmitriy Zaporozhets [Fri, 22 Mar 2013 17:11:15 +0000 (10:11 -0700)]
Merge pull request #3300 from aus/patch-1
Change gollum repo to use https:// instead of git://
Dmitriy Zaporozhets [Fri, 22 Mar 2013 17:10:07 +0000 (10:10 -0700)]
Merge pull request #3303 from dosire/attribute
Attribution as mentioned in https://news.ycombinator.com/item?id=
5423635
Sytse Sijbrandij [Fri, 22 Mar 2013 16:54:42 +0000 (17:54 +0100)]
All involved are mentioned. https://news.ycombinator.com/item?id=
5424050
Dmitriy Zaporozhets [Fri, 22 Mar 2013 16:52:25 +0000 (18:52 +0200)]
fix xss issue in blame
Sytse Sijbrandij [Fri, 22 Mar 2013 16:42:31 +0000 (17:42 +0100)]
Use real name.
Sytse Sijbrandij [Fri, 22 Mar 2013 16:39:22 +0000 (17:39 +0100)]
Attribution as mentioned in https://news.ycombinator.com/item?id=
5423635