Commit graph

4376 commits

Author SHA1 Message Date
Dmitriy Zaporozhets a4e6ab0a29 Fixing and commenting tests 2012-11-26 14:44:29 +02:00
Dmitriy Zaporozhets e750efd9fc Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests
Diff and patch for commits and merge requests
2012-11-26 04:40:49 -08:00
Dmitriy Zaporozhets 2d5a6fc850 Fix dir permission on creation 2012-11-26 13:07:16 +02:00
Dmitriy Zaporozhets ca8bb9dff8 Fix projectmover dir permission 2012-11-26 12:52:49 +02:00
Dmitriy Zaporozhets 7ae851f642 Fix critical issue with dir permission for namespaces 2012-11-26 12:43:32 +02:00
Dmitriy Zaporozhets 585eb70588 Fix http push with namespaces. Allow use of username as login 2012-11-26 11:23:08 +02:00
Riyad Preukschas 79a4ed15ce Change "Get Patch" buttons to dropdowns orffering patches and diffs 2012-11-25 00:36:19 +01:00
Riyad Preukschas 267b18dead Add specs for exporting merge requests as diff or patch 2012-11-25 00:06:53 +01:00
Riyad Preukschas b3834bc9b0 Remove MergeRequest#to_raw and replace it with #to_diff and #to_patch 2012-11-25 00:05:47 +01:00
Riyad Preukschas 2b1afa0e62 Remove merge_request#raw and replace it with formats to #show
Needed to add a constraint on the id. Otherwise the format was parsed as part of the id.
2012-11-25 00:05:44 +01:00
Riyad Preukschas ddb7399ac4 Add specs for exporting commits as diff or patch 2012-11-25 00:05:11 +01:00
Riyad Preukschas 3b7c2adf0a Add diff format to commit#show 2012-11-22 20:49:44 +01:00
Riyad Preukschas 246faa3d7a Add Commit#to_diff for raw diff 2012-11-22 20:49:01 +01:00
Riyad Preukschas 8b4010397c Register diff mime type 2012-11-22 20:22:44 +01:00
Riyad Preukschas 6ddf4567f4 Don't escape Html in patches
Fixes #2036
2012-11-22 12:45:39 +01:00
Dmitriy Zaporozhets 0046409970 I prefer icons on header 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets 6bf656970d Use fieldset. Improved profile 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets f614ae8ef7 Increased test coverage 2012-11-21 07:14:05 +03:00
Dmitriy Zaporozhets e9be4b375b Cover ProjectMover with tests 2012-11-21 06:18:05 +03:00
Dmitriy Zaporozhets 47234ab367 Validate username. Gitlab::Regex added 2012-11-28 06:14:05 +03:00
Dmitriy Zaporozhets 5ed4e7e216 Revert raphael-rails in order to make network work correctly 2012-11-28 11:45:33 +02:00
Dmitriy Zaporozhets 0bec49ebc1 Merge pull request #2100 from hiroponz/fix_non_utf8_file_encoding
Fix #2058 diff problem of non ascii paths and non utf-8 file encoding
2012-11-28 01:39:52 -08:00
satoh 001729bb40 Fix #2058 diff problem of non ascii paths and non utf-8 file encoding 2012-11-28 18:32:06 +09:00
Dmitriy Zaporozhets d18e2bd59d styled error message 2012-11-21 06:14:05 +03:00
Dmitriy Zaporozhets c1c1a1eeee Restored old h6 of bootstrap. Fixed buttons line-height 2012-11-21 09:14:15 +02:00
Dmitriy Zaporozhets 3ab33fcfca Add post-receive file content validation 2012-11-21 09:04:32 +02:00
Dmitriy Zaporozhets b39002ce88 Use namespace for gitlab resque 2012-11-21 00:40:29 +02:00
Dmitriy Zaporozhets ec7a1c504f Fix tabs line height 2012-11-21 00:18:36 +02:00
Dmitriy Zaporozhets dc9916b474 Merge pull request #1998 from erroric/gitlabhq_issue1669
fix for issue #1669
2012-11-20 14:10:45 -08:00
Dmitriy Zaporozhets 68b119f62f Merge pull request #2022 from simonoff/master
Resque must be running in the own namespace
2012-11-20 14:08:57 -08:00
Dmitriy Zaporozhets 752468b20c Merge branch 'update/bootstrap2211' of dev.gitlabhq.com:gitlabhq 2012-11-20 21:19:09 +00:00
Dmitriy Zaporozhets 4d846c09b1 Fixed spec 2012-11-20 23:18:44 +02:00
Dmitriy Zaporozhets 942c410119 Implemented bootstrap 2.2.1.1. Restyled header panel 2012-11-20 23:05:15 +02:00
Dmitriy Zaporozhets 236584c2f8 update bootstrap to 2.2.1.1 2012-11-20 20:01:25 +02:00
Dmitriy Zaporozhets ebcbe0c87b Add status badge for MR 2012-11-20 20:34:05 +03:00
Alexander Simonov 18bc873d53 Resque must be running in the own namespace 2012-11-20 18:59:37 +02:00
Alexander Simonov 10d8b77b50 Clean old rails2 style code 2012-11-20 18:59:28 +02:00
Dmitriy Zaporozhets ed92cfdebd Fix method call for service hook 2012-11-20 16:46:22 +02:00
Hugo Duksis a9c2500a55 Stub for Dir.chdir as it is not needed 2012-11-20 16:34:58 +02:00
Dmitriy Zaporozhets f6248c255e User custom method for services array 2012-11-20 14:22:00 +02:00
Dmitriy Zaporozhets 93fdc4ca9d Reannotated 2012-11-20 14:19:55 +02:00
Dmitriy Zaporozhets 9f65c274ef Fix ci service creation logic 2012-11-20 14:16:04 +02:00
Hugo Duksis e7e1e99e92 retrieve settings with symbols 2012-11-19 22:42:58 +02:00
Hugo Duksis a8eb3fe1d2 tests for issue #1984 2012-11-19 22:42:58 +02:00
Dmitriy Zaporozhets 406a0c809b GitLabCi Service imtegration 2012-11-19 22:34:05 +03:00
Dmitriy Zaporozhets 8500743464 Post Receive Refactored. Service hooks also triggered now 2012-11-19 21:44:05 +03:00
Dmitriy Zaporozhets 95c23b2f97 Annotated. schema updated 2012-11-19 21:24:05 +03:00
Dmitriy Zaporozhets c3b074acab Service model and service hook 2012-11-20 11:33:49 +02:00
Dmitriy Zaporozhets be1dc5544a resque via nohup 2012-11-19 15:11:20 +02:00
Dmitriy Zaporozhets 4eef112462 Merge pull request #1906 from dosire/user_cannot_be_removed_if_project_owner
Cannot remove user that owns a project.
2012-11-19 04:12:31 -08:00