OSDN Git Service
Riyad Preukschas [Wed, 9 Jan 2013 18:34:13 +0000 (10:34 -0800)]
Merge pull request #2527 from VonC/gitignore
Update .gitignore
Dmitriy Zaporozhets [Wed, 9 Jan 2013 18:31:05 +0000 (20:31 +0200)]
Fix sidekiq chech and added script/check
Dmitriy Zaporozhets [Wed, 9 Jan 2013 17:38:27 +0000 (19:38 +0200)]
Spinach: admin logs, admin users
VonC [Wed, 9 Jan 2013 09:04:41 +0000 (09:04 +0000)]
gitignore updates.
Most yml files are ignored in gitlab/config/, except resque.yml
=> add it to the list of ignored files.
Dmitriy Zaporozhets [Wed, 9 Jan 2013 16:21:49 +0000 (18:21 +0200)]
Merge branch 'sidekiq'
Dmitriy Zaporozhets [Wed, 9 Jan 2013 09:07:55 +0000 (11:07 +0200)]
Rails upto 3.2.11
Dmitriy Zaporozhets [Wed, 9 Jan 2013 08:35:32 +0000 (00:35 -0800)]
Merge pull request #2484 from netdata/fix_url_encode
Fixing request.fullpath URL encoding
Dmitriy Zaporozhets [Wed, 9 Jan 2013 07:47:25 +0000 (09:47 +0200)]
Fix routing specs
Dmitriy Zaporozhets [Wed, 9 Jan 2013 07:43:43 +0000 (23:43 -0800)]
Merge pull request #2516 from jouve/fix_json_exemples_in_help
fix exemple js data in help/web_hook
Dmitriy Zaporozhets [Wed, 9 Jan 2013 07:34:26 +0000 (09:34 +0200)]
Fixed tree logs for branches with slash. Fixed remember of path when switch branch
Dmitriy Zaporozhets [Wed, 9 Jan 2013 06:14:05 +0000 (09:14 +0300)]
spinach test: project services
Dmitriy Zaporozhets [Wed, 9 Jan 2013 10:04:55 +0000 (12:04 +0200)]
set undefined features
Dmitriy Zaporozhets [Wed, 9 Jan 2013 06:14:05 +0000 (09:14 +0300)]
sidekiq with green tests
Dmitriy Zaporozhets [Wed, 9 Jan 2013 05:44:05 +0000 (08:44 +0300)]
email via sidekiq. start and stop rake tasks
Dmitriy Zaporozhets [Wed, 9 Jan 2013 05:14:05 +0000 (08:14 +0300)]
A bit of spinach tests
Dmitriy Zaporozhets [Wed, 9 Jan 2013 05:14:05 +0000 (08:14 +0300)]
sidekiq
Cyril [Tue, 8 Jan 2013 14:34:15 +0000 (15:34 +0100)]
fix exemple js data in help/web_hook
Dmitriy Zaporozhets [Tue, 8 Jan 2013 10:23:33 +0000 (12:23 +0200)]
Fix minor style issue for compare
Dmitriy Zaporozhets [Tue, 8 Jan 2013 05:14:05 +0000 (08:14 +0300)]
a bit of restyling for issues and merge request lists
Dmitriy Zaporozhets [Mon, 7 Jan 2013 20:22:35 +0000 (22:22 +0200)]
organize simplecov
Riyad Preukschas [Mon, 7 Jan 2013 20:18:41 +0000 (21:18 +0100)]
Fix checking for the recommended Gitolite version
Fixes #2475
Riyad Preukschas [Mon, 7 Jan 2013 18:47:53 +0000 (19:47 +0100)]
Fix check for outdated config file
Riyad Preukschas [Mon, 7 Jan 2013 18:39:15 +0000 (19:39 +0100)]
Add a check whether repos_path is a symlink
Riyad Preukschas [Mon, 7 Jan 2013 18:19:50 +0000 (19:19 +0100)]
Fix bug in OS detection in check task
Riyad Preukschas [Mon, 7 Jan 2013 18:04:20 +0000 (19:04 +0100)]
Fix accessing the project repository path in check task
Fixes #2496
Dmitriy Zaporozhets [Mon, 7 Jan 2013 20:05:21 +0000 (22:05 +0200)]
Fix group test after ajax activity
Dmitriy Zaporozhets [Mon, 7 Jan 2013 18:48:57 +0000 (20:48 +0200)]
Common filtering for dashboard and group. Share partial search result partial
Riyad Preukschas [Mon, 7 Jan 2013 18:15:27 +0000 (10:15 -0800)]
Merge pull request #2504 from mitchty/sles_changes
Update info.rake to be able to run successfully on SuSE.
Riyad Preukschas [Mon, 7 Jan 2013 17:41:27 +0000 (09:41 -0800)]
Merge pull request #2485 from gliptak/patch-2
Renaming check function from 1056 to 1059
Mitch Tishmack [Mon, 7 Jan 2013 17:07:11 +0000 (11:07 -0600)]
Update info.rake to be able to run successfully on SuSE.
Dmitriy Zaporozhets [Mon, 7 Jan 2013 15:36:24 +0000 (17:36 +0200)]
Validate username uniq in scope of namespace
Dmitriy Zaporozhets [Mon, 7 Jan 2013 12:44:57 +0000 (14:44 +0200)]
Fixed tests
Dmitriy Zaporozhets [Mon, 7 Jan 2013 12:36:01 +0000 (14:36 +0200)]
Speedup dashboard via loading events with ajax
Dmitriy Zaporozhets [Mon, 7 Jan 2013 12:08:03 +0000 (14:08 +0200)]
Improve milestone show page
Dmitriy Zaporozhets [Mon, 7 Jan 2013 09:32:12 +0000 (11:32 +0200)]
Fix xss vulnerability
Dmitriy Zaporozhets [Sat, 5 Jan 2013 22:30:38 +0000 (00:30 +0200)]
Added cleanup to help rake
Dmitriy Zaporozhets [Sat, 5 Jan 2013 22:08:02 +0000 (00:08 +0200)]
Green button when we create new item, blue when save or some primary action
Dmitriy Zaporozhets [Sat, 5 Jan 2013 21:49:01 +0000 (23:49 +0200)]
Fix network test and snippets expired
Dmitriy Zaporozhets [Sat, 5 Jan 2013 21:36:04 +0000 (23:36 +0200)]
Add RAILS_ENV to rake docs
Dmitriy Zaporozhets [Sat, 5 Jan 2013 21:29:48 +0000 (23:29 +0200)]
Fix backup/restore path_to_repo
Dmitriy Zaporozhets [Sat, 5 Jan 2013 21:26:14 +0000 (23:26 +0200)]
Fix merge_request js -> ci_path
Dmitriy Zaporozhets [Sat, 5 Jan 2013 21:18:05 +0000 (23:18 +0200)]
Merge branch 'koenpunt-raphael-update'
Dmitriy Zaporozhets [Sat, 5 Jan 2013 21:17:50 +0000 (23:17 +0200)]
Merge branch 'raphael-update' of https://github.com/koenpunt/gitlabhq into koenpunt-raphael-update
Conflicts:
Gemfile.lock
Dmitriy Zaporozhets [Sat, 5 Jan 2013 21:09:38 +0000 (23:09 +0200)]
Merge branch 'koenpunt-mergerequest-to-coffee'
Dmitriy Zaporozhets [Sat, 5 Jan 2013 21:09:26 +0000 (23:09 +0200)]
Raise exception and show message to user if repo missing satellite
Dmitriy Zaporozhets [Sat, 5 Jan 2013 20:54:48 +0000 (22:54 +0200)]
Merge branch 'mergerequest-to-coffee' of https://github.com/koenpunt/gitlabhq into koenpunt-mergerequest-to-coffee
Dmitriy Zaporozhets [Sat, 5 Jan 2013 20:50:12 +0000 (22:50 +0200)]
Fix project fixtures
Dmitriy Zaporozhets [Sat, 5 Jan 2013 20:33:39 +0000 (12:33 -0800)]
Merge pull request #2226 from jouve/username
add username to team_member page
Dmitriy Zaporozhets [Sat, 5 Jan 2013 18:03:13 +0000 (10:03 -0800)]
Merge pull request #2207 from koenpunt/system-to-fileutils
replaced system() calls with FileUtils.* methods
Dmitriy Zaporozhets [Sat, 5 Jan 2013 18:01:10 +0000 (10:01 -0800)]
Merge pull request #2487 from koenpunt/patch-2
Fixed typo of recipes (recipres) in development fixtures
Dmitriy Zaporozhets [Sat, 5 Jan 2013 12:49:08 +0000 (14:49 +0200)]
Remove unused styles. Restyled Issues a bit
Dmitriy Zaporozhets [Sat, 5 Jan 2013 11:30:42 +0000 (13:30 +0200)]
Update to rails 3.2.10. Use simplercov in spinach too
Dmitriy Zaporozhets [Sat, 5 Jan 2013 11:12:31 +0000 (13:12 +0200)]
Add ci.gitlab.org badge
Dmitriy Zaporozhets [Sat, 5 Jan 2013 11:11:15 +0000 (13:11 +0200)]
Remove unused methods
Dmitriy Zaporozhets [Sat, 5 Jan 2013 10:12:02 +0000 (12:12 +0200)]
Tests are fixed now
Koen Punt [Sat, 5 Jan 2013 01:18:39 +0000 (02:18 +0100)]
Converted merge_requests.js to coffeescript and updated code
Dmitriy Zaporozhets [Fri, 4 Jan 2013 22:49:58 +0000 (00:49 +0200)]
Merge branch 'refactoring/backend'
Dmitriy Zaporozhets [Fri, 4 Jan 2013 22:49:43 +0000 (00:49 +0200)]
Fix security spec
Dmitriy Zaporozhets [Fri, 4 Jan 2013 22:43:32 +0000 (00:43 +0200)]
Fix some tests. Use travis-ci 1.9.2
Dmitriy Zaporozhets [Fri, 4 Jan 2013 22:35:38 +0000 (00:35 +0200)]
Fixed styles, ProjectHook specs etc
Dmitriy Zaporozhets [Fri, 4 Jan 2013 21:35:31 +0000 (23:35 +0200)]
use ui-box as for all
Dmitriy Zaporozhets [Fri, 4 Jan 2013 20:13:32 +0000 (22:13 +0200)]
Show images preview in notes. Show line additions/deletions for commit
Dmitriy Zaporozhets [Fri, 4 Jan 2013 19:45:30 +0000 (21:45 +0200)]
Fixed protected branches and file edit
Dmitriy Zaporozhets [Fri, 4 Jan 2013 16:50:31 +0000 (18:50 +0200)]
Rspec fixes
Koen Punt [Fri, 4 Jan 2013 16:43:41 +0000 (17:43 +0100)]
Fixed typo of recipes (recipres)
gliptak [Fri, 4 Jan 2013 15:14:55 +0000 (10:14 -0500)]
Renaming check function from 1056 to 1059
Wouter D'Haeseleer [Fri, 4 Jan 2013 14:05:00 +0000 (15:05 +0100)]
Fixing request.fullpath URL encoding
Let's assume your path is = "project/tree/master/This%20Is%20valid"
In this case gitlab renders a 404.
To fix this we should decode the path so that it looks like
"project/tree/master/This Is valid"
Koen Punt [Fri, 4 Jan 2013 12:58:58 +0000 (13:58 +0100)]
raphael from gitlabhq
Koen Punt [Thu, 3 Jan 2013 16:21:16 +0000 (17:21 +0100)]
updated g.raphael
Koen Punt [Fri, 28 Dec 2012 15:36:42 +0000 (16:36 +0100)]
Updated graph tooltips and labels
Koen Punt [Sun, 23 Dec 2012 21:46:27 +0000 (22:46 +0100)]
updated raphael
better labels
Dmitriy Zaporozhets [Fri, 4 Jan 2013 06:43:25 +0000 (08:43 +0200)]
Continue refactoring. Use repostory and team
Dmitriy Zaporozhets [Thu, 3 Jan 2013 19:09:18 +0000 (21:09 +0200)]
REpostiry, Team models
Dmitriy Zaporozhets [Thu, 3 Jan 2013 17:11:14 +0000 (19:11 +0200)]
Rspec models Milestone, Commit, UsersProject
Koen Punt [Fri, 7 Dec 2012 00:51:49 +0000 (01:51 +0100)]
replaced system() calls with FileUtils.* method
This also makes that 'mv: cannot stat `/ho..' is not shown in the test :)
consistent spacing
require fileutils
Revert "require fileutils"
This reverts commit
54313d3bbaa60cfc5b405be50cc00b7f6b0cb715.
new hash notation
FileUtils.mv in begin/rescue block
Dmitriy Zaporozhets [Thu, 3 Jan 2013 10:37:12 +0000 (12:37 +0200)]
fix tests
Dmitriy Zaporozhets [Thu, 3 Jan 2013 07:52:14 +0000 (09:52 +0200)]
move activated? method to service
Dmitriy Zaporozhets [Thu, 3 Jan 2013 07:37:13 +0000 (09:37 +0200)]
Fixed tests. added test for gitlab_ci_service model
Dmitriy Zaporozhets [Thu, 3 Jan 2013 07:12:24 +0000 (09:12 +0200)]
Add concerns to autoload
Dmitriy Zaporozhets [Thu, 3 Jan 2013 07:07:32 +0000 (23:07 -0800)]
Merge pull request #2461 from gitlabhq/remove_roles
Remove models/roles and return to fat models
Dmitriy Zaporozhets [Thu, 3 Jan 2013 07:06:07 +0000 (09:06 +0200)]
more refactoring using models/concerns
Dmitriy Zaporozhets [Wed, 2 Jan 2013 22:01:08 +0000 (00:01 +0200)]
Few more fixes after removing roles
Dmitriy Zaporozhets [Wed, 2 Jan 2013 21:35:11 +0000 (23:35 +0200)]
Get rid of roles
Dmitriy Zaporozhets [Wed, 2 Jan 2013 20:39:02 +0000 (22:39 +0200)]
Improve Extract path
Dmitriy Zaporozhets [Wed, 2 Jan 2013 19:52:03 +0000 (21:52 +0200)]
More readable Title for tab
Dmitriy Zaporozhets [Wed, 2 Jan 2013 18:59:47 +0000 (20:59 +0200)]
Fix crash on group => show
Dmitriy Zaporozhets [Wed, 2 Jan 2013 18:45:11 +0000 (20:45 +0200)]
Fixed admin -> group -> show
Dmitriy Zaporozhets [Wed, 2 Jan 2013 18:25:25 +0000 (20:25 +0200)]
Fixed missing current user for issue observer
Dmitriy Zaporozhets [Wed, 2 Jan 2013 17:56:22 +0000 (19:56 +0200)]
Fixed spinach
Dmitriy Zaporozhets [Wed, 2 Jan 2013 17:46:06 +0000 (19:46 +0200)]
Fix api specs. Use id instead path
Dmitriy Zaporozhets [Wed, 2 Jan 2013 17:32:34 +0000 (19:32 +0200)]
Fix few bugs and tests after refactoring ownership logic
Dmitriy Zaporozhets [Wed, 2 Jan 2013 17:00:00 +0000 (19:00 +0200)]
Project has now correct owner and creator. Increased test coverage
Dmitriy Zaporozhets [Wed, 2 Jan 2013 16:57:02 +0000 (18:57 +0200)]
Fix #2375. Admin and owner can manage groups
Saito [Tue, 1 Jan 2013 06:51:31 +0000 (22:51 -0800)]
Merge pull request #2450 from jojosch/fix-grack-gitignore
fix grack accessing files beginning with .git
Johannes Schleifenbaum [Mon, 31 Dec 2012 22:12:07 +0000 (23:12 +0100)]
fix grack accessing files beginning with .git
Dmitriy Zaporozhets [Mon, 31 Dec 2012 17:46:40 +0000 (19:46 +0200)]
Bit of cleanup and improving mailer
Dmitriy Zaporozhets [Mon, 31 Dec 2012 17:06:49 +0000 (19:06 +0200)]
Corrent link for MR diff note in email
Dmitriy Zaporozhets [Mon, 31 Dec 2012 16:35:38 +0000 (18:35 +0200)]
Fix MR css for accept MR block
Dmitriy Zaporozhets [Mon, 31 Dec 2012 16:22:44 +0000 (18:22 +0200)]
Use project with namespace in email subject
Dmitriy Zaporozhets [Mon, 31 Dec 2012 15:46:40 +0000 (17:46 +0200)]
Add subdir support for rewrite-hooks script