OSDN Git Service
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
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
Dmitriy Zaporozhets [Mon, 31 Dec 2012 10:00:46 +0000 (12:00 +0200)]
Fix backup/restore of repos
Dmitriy Zaporozhets [Mon, 31 Dec 2012 08:15:19 +0000 (00:15 -0800)]
Merge pull request #2438 from cvut/query-perf
Optimize query for keys of repository members
Dmitriy Zaporozhets [Sun, 30 Dec 2012 18:26:09 +0000 (20:26 +0200)]
Add missing subject for wall comment
Jakub Jirutka [Sun, 30 Dec 2012 17:54:02 +0000 (18:54 +0100)]
Optimize query for keys of repository members
…to load them at once and then use query cache.
Dmitriy Zaporozhets [Sun, 30 Dec 2012 14:19:31 +0000 (16:19 +0200)]
Describe for Roles
Dmitriy Zaporozhets [Sun, 30 Dec 2012 13:15:56 +0000 (15:15 +0200)]
use gitlab omniauth-ldap gem instead of fork
Dmitriy Zaporozhets [Sun, 30 Dec 2012 12:54:08 +0000 (14:54 +0200)]
Replace yaml_db fork with gem
Dmitriy Zaporozhets [Sun, 30 Dec 2012 12:43:00 +0000 (14:43 +0200)]
Use sdoc to generate application code documentation
Dmitriy Zaporozhets [Sun, 30 Dec 2012 12:26:19 +0000 (14:26 +0200)]
Improve perfomance of removeing group
Dmitriy Zaporozhets [Sun, 30 Dec 2012 12:09:43 +0000 (14:09 +0200)]
Fix project destroy timeout from admin area. Added 30 ssh keys to dev seeds
Dmitriy Zaporozhets [Sun, 30 Dec 2012 11:50:23 +0000 (13:50 +0200)]
Add groups to search autocomplete. Use alphabetically scope for users order
Dmitriy Zaporozhets [Sun, 30 Dec 2012 11:37:33 +0000 (13:37 +0200)]
Get rid of skipping callbacks in production code. Dont trigger gitolite more than once on import in group
Saito [Sat, 29 Dec 2012 20:19:07 +0000 (12:19 -0800)]
Merge pull request #2162 from frohoff/config-improvements
support for running in non-root directory/path (RAILS_RELATIVE_URL_ROOT)
Riyad Preukschas [Fri, 28 Dec 2012 22:44:55 +0000 (14:44 -0800)]
Merge pull request #2423 from hopson/master
Spelling error in merge request email
Robert Hopson [Fri, 28 Dec 2012 18:56:48 +0000 (10:56 -0800)]
Update app/views/notify/new_merge_request_email.html.haml
Fix spelling of 'assignee'
Chris Frohoff [Fri, 28 Dec 2012 18:11:28 +0000 (18:11 +0000)]
added RAILS_RELATIVE_URL_ROOT support
Dmitriy Zaporozhets [Fri, 28 Dec 2012 03:24:05 +0000 (06:24 +0300)]
Fix dir_exists?
Dmitriy Zaporozhets [Fri, 28 Dec 2012 03:14:05 +0000 (06:14 +0300)]
Fixed and improved enable_naamespace migration task
Dmitriy Zaporozhets [Fri, 28 Dec 2012 09:02:43 +0000 (01:02 -0800)]
Merge pull request #2390 from simi/master
No need to install custom phantomjs for travis.
Dmitriy Zaporozhets [Fri, 28 Dec 2012 07:29:57 +0000 (09:29 +0200)]
Allow spaces in project name
Dmitriy Zaporozhets [Fri, 28 Dec 2012 07:14:28 +0000 (09:14 +0200)]
Merge branch 'feature/add_user_to_projects_in_group-2298' of https://github.com/zzet/gitlabhq into zzet-feature/add_user_to_projects_in_group-2298
Dmitriy Zaporozhets [Thu, 27 Dec 2012 14:59:52 +0000 (06:59 -0800)]
Merge pull request #2394 from troyanov/master
fix warning 'nohup: redirecting stderr to stdout' for resque.sh
Dmitriy Zaporozhets [Thu, 27 Dec 2012 03:14:05 +0000 (06:14 +0300)]
Fix not_in_project scope. Added counters in admin -> users. Improved seeds
Dmitriy Zaporozhets [Thu, 27 Dec 2012 10:13:18 +0000 (12:13 +0200)]
Dev fixtures: Add sample ssh key to admin
Dmitriy Zaporozhets [Thu, 27 Dec 2012 09:23:17 +0000 (01:23 -0800)]
Merge pull request #2386 from cvut/fix-passenger
Fix shared Redis connection issue on Passenger
Andrey Kumanyaev [Wed, 26 Dec 2012 16:31:47 +0000 (20:31 +0400)]
test reanimated
Andrey Kumanyaev [Wed, 26 Dec 2012 16:31:18 +0000 (20:31 +0400)]
Fix form url and routes path