deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3210 commits 6 branches 43 tags 25 MiB
Commit graph

422 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 9aafe77e70 I want be able to get token via api. Used for mobile applications 2012-09-20 17:45:07 +03:00
Nihad Abbasov 37817cc31d API: expose project id for milestones 2012-09-20 18:38:34 +06:00
Dmitriy Zaporozhets ed899a2f4b Replace sanitize with escape once 2012-09-20 11:50:22 +03:00
randx 6104942438 Sanitize for network graph 2012-09-20 09:06:12 +03:00
Robert Speicher 345c4d2a77 Update gfm so escaped text is still parsed for references 2012-09-19 20:21:35 -04:00
Saito aaa916f15c use high level api and compatibility with Passenger 2012-09-17 18:36:23 +08:00
Alex Denisov c83af0dfe7 Uses attributes_for_keys 2012-09-16 22:44:20 +03:00
Alex Denisov b6c6a5b159 Merge branch 'master' into ssh_keys_api 2012-09-16 22:37:50 +03:00
Alex Denisov b896880eb4 Method name changed 2012-09-16 20:08:57 +03:00
Alex Denisov 549c4c2202 API attributes refactored 2012-09-16 19:51:04 +03:00
Alex Denisov 87d40fd276 Docs added 2012-09-16 18:21:59 +03:00
Alex Denisov c23eb40829 SSH Keys API implemented 2012-09-16 17:52:06 +03:00
Robert Speicher d993f66642 Fix HTML entities being parsed in GFM 
Also fixes the spec so that it actually tests the thing it says it's
testing. Hooray!

Closes #1308
 2012-09-13 15:20:00 -04:00
Robert Speicher 0d77209ea0 Be more resilient in the case of missing omniauth settings 
Should no longer freak out when omniauth settings aren't present in
gitlab.yml. People who aren't using it shouldn't even have to put a
'false' entry in their config for it (and probably wouldn't, after an
upgrade).
 2012-09-12 18:11:59 -04:00
Dmitriy Zaporozhets 3643df1f7c Merge pull request #1411 from miks/project_hooks_api 
Project hooks API
 2012-09-12 12:16:35 -07:00
Dmitriy Zaporozhets 048d47e626 Refactorn oauth & ldap 2012-09-12 09:23:16 +03:00
randx 0523b4265b Application logger 2012-09-11 23:24:53 +03:00
Dmitriy Zaporozhets 3f01ec2d5b Merge pull request #1426 from NARKOZ/spinach 
Cucumber => Spinach
 2012-09-10 09:09:07 -07:00
miks 6d76e000d0 Add authorization to hooks requests 2012-09-10 16:50:01 +03:00
miks 2e34a6d3c4 Merge branch 'master' into project_hooks_api 2012-09-10 16:47:31 +03:00
Nihad Abbasov ae9689f8ff remove cucumber completely 2012-09-10 06:40:57 -07:00
Alex Denisov e68d0841be Merge branch 'master' into api_errors_refactoring 2012-09-10 14:10:34 +03:00
Alex Denisov a065557208 Common errors method added 2012-09-10 13:49:00 +03:00
Alex Denisov 915dac0055 Error throwing moved to api_helper 2012-09-10 10:41:46 +03:00
Cyril e7f483f9f4 fix typo 2012-09-10 10:50:07 +02:00
randx b565f33472 Auth for API 2012-09-10 09:06:11 +03:00
miks 3b5a90bdf6 Projects hooks API implemented 2012-09-08 20:51:12 +03:00
miks 27e4436507 Return empty body 2012-09-08 20:01:08 +03:00
miks 4226458faf Merge branch 'master' into project_users_api 2012-09-08 10:50:24 +03:00
Riyad Preukschas d661b893c5 Prevent gfm() to leak changes to the string supplied through the _text_ argument 2012-09-08 01:58:12 +02:00
Riyad Preukschas ce3fb94939 Fix bug where parsing of emoji was unnecessarily dependent on @project being set 2012-09-08 01:11:44 +02:00
Riyad Preukschas 5348ee6278 Fix Ruby anti-pattern in Markdown 2012-09-07 22:14:17 +02:00
randx e8f39a0a61 gitolite -> more exceptions 2012-09-07 20:43:51 +03:00
Dmitriy Zaporozhets 963746f978 Refactor gitolite_config 2012-09-07 09:15:30 +03:00
randx b994a65fc3 change gitolite backend behaviour to prevent error when config directory removed 2012-09-07 15:36:40 +03:00
Dmitriy Zaporozhets 79021e674b Split gitolite backend. Use gitolite_config methods moved to separate class 2012-09-07 08:16:29 +03:00
Dmitriy Zaporozhets 137594dd08 Merge pull request #1339 from chopmann/fix-import_bulk 
fix bulk_import for #1309
 2012-09-07 00:44:44 -07:00
randx 5cb9e7eedc Fix emojii 2012-09-07 09:16:04 +03:00
Dmitriy Zaporozhets 4f8a4aa44c Merge pull request #1384 from tsigo/emoji 
Emoji!
 2012-09-06 23:05:18 -07:00
Dmitriy Zaporozhets 7c0a1068bf Merge pull request #1363 from AlexDenisov/api_create_project_fixes 
API create project fixes
 2012-09-06 23:00:04 -07:00
miks 909c8c345d Make project users API more RESTful 2012-09-06 23:49:29 +03:00
Robert Speicher 3a63f6f316 Simplify EMOJI_PATTERN 2012-09-06 15:26:55 -04:00
Robert Speicher 8808c5fa8d Merge branch 'master' into emoji 2012-09-06 15:23:42 -04:00
Alex Denisov 09a86bd4d6 Capitlization of /gitlab/i normalized. #1367 2012-09-06 11:21:35 +03:00
Cornelio b3c8688da3 fix bulk_import for #1309 2012-09-06 08:56:46 +02:00
miks e3b1f62c6b convert params hash to array 2012-09-06 00:13:25 +03:00
Robert Speicher b3bbf53e9b Set the size of emoji to be 20x20 
Forgot they were so big!
 2012-09-05 16:14:54 -04:00
Robert Speicher 67a6a0b29b Change Gitlab::Markdown to a module; add emoji parsing 2012-09-05 16:07:39 -04:00
miks 8f7360f390 API on adding users to project implemented 2012-09-05 23:01:03 +03:00
Alex Denisov 9b9dd3f9bf Unnecessary code removed 2012-09-05 11:44:47 +03:00
randx d59d2a197e cleanup gitlab from setup scripts 2012-09-04 20:29:20 +03:00
randx 874a86f820 update install to use recipes 2012-09-04 19:44:17 +03:00
Robert Speicher 12c57a7061 Change hardcoded base path to use Gitlab settings 
Closes #1072
 2012-09-04 05:05:56 -04:00
Tse-Ching Ho 457b0f604f use APP_ROOT in init-gitlab to specify root of project 2012-09-04 16:39:10 +08:00
Alex Denisov e078a173d6 Create project via API: fixes added 2012-09-03 18:00:24 +03:00
Nihad Abbasov 76e4d94d43 add pagination to API 2012-09-03 04:46:29 -07:00
Dmitriy Zaporozhets cc03600b22 Merge pull request #1347 from AlexDenisov/api_project_creation 
API for new project creation
 2012-09-03 01:48:51 -07:00
Sytse Sijbrandij cc137bba79 Update the references to the script and refer to it from the installation manual. 
Update the references to the script and refer to it from the installation manual.

Indent the code block.
 2012-09-02 22:44:11 +02:00
Dmitriy Zaporozhets 65402f1a1a Merge pull request #1318 from dosire/non-interactive-aws-install 
Non interactive aws install
 2012-09-02 12:09:48 -07:00
Robert Speicher 40d619107f Add link_title to CommitDecorator 2012-09-02 13:40:14 -04:00
Sytse Sijbrandij b80dd3d242 Non-interactive AWS install by running a single script. 
Merge branch 'master' into non-interactive-aws-install

Conflicts:
	doc/installation.md

Fix merge mess in installation.md
 2012-09-02 18:39:50 +02:00
Sytse Sijbrandij eae41ad1df Non-interactive AWS install by running a single script. 
Non-interactive AWS install by running a single script.

Complete non-interactive AWS install with one line.

Squash of 28 commits:

Initial commit of complete install script.

Must be sudo.

Non interactive prostgres.

Install mysql with unique password.

Service file.

Add init file.

Nginx config.

Script contains aws specific settings.

Update references after rename.

Prevent localhost ssh prompt.

Postfix with policyd.

Typo in localhost. Postfix package has other name. sudo -l session needs oneliners.

More sudo commands to prevent permission problems.

Change in existing file.

Change in existing file must be referenced.

Switch order.

Postfix comment.

Old way to generate password, less sudo.

todo login

Must use private ip and login instructions.

Starting up.

Fixed and checked various todos.

Use service. Set host name. Go to default dir.

Only works on next login.

Only replace first host.

Cleaned up the comments.

Link to nginx config.

Move to aws dir.

Update links to aws for interactive install.

Existing script stays at the same location.

Change directory. Use the new init scripts for gitlab service and nginx. Use the branch for file downloads. Update with newest changes to installation.md.

Correct reference.

Use master branch since we need the nginx condfig and use absolute paths.

Need to copy with sudo.
 2012-09-02 18:29:46 +02:00
Alex Denisov 9811e64d71 Typo and mistakes fixed 2012-08-31 11:11:12 +03:00
Alex Denisov c1173e2707 API on Projects creation implemented 2012-08-31 10:15:37 +03:00
Robert Speicher 8a49cdc3b4 Add milestone API docs to doc/README and views/help/api 
Also removes `closed` attribute option from create action.
 2012-08-29 08:45:00 -04:00
Dmitriy Zaporozhets 14f5d1727a Merge branch 'milestone_api' of https://github.com/tsigo/gitlabhq into tsigo-milestone_api 
Conflicts:
	spec/requests/api/issues_spec.rb
 2012-08-29 15:35:12 +03:00
randx a56cec1132 specify gitolite-admin owner in config 2012-08-29 02:08:39 +03:00
randx ad3a88cfd3 Prepared for gitolite v3 2012-08-29 02:03:04 +03:00
Dmitriy Zaporozhets ebd2a5d0ce Merge pull request #1387 from miks/project_users_api 
Project users api
 2012-09-09 01:18:46 -07:00
Dae Myung 8559d9a156 sending argument project but there is no project to send 2012-09-08 04:24:38 -07:00
randx b03ee4666b Handle invalid ssh exception 2012-08-29 00:44:26 +03:00
randx c48c0f95b2 Gitlab::Gitolite final fixes. Seems like all functionality is working correctly now 2012-08-29 00:33:19 +03:00
randx e8e8ca940b Fixed access to removed method 2012-08-29 00:19:34 +03:00
randx d6b2b4f069 fixed configure call within gitolite 2012-08-29 00:16:33 +03:00
randx 7cdc5b9e04 Use similar interface to access gitolite 
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
 2012-08-29 00:04:06 +03:00
Dmitriy Zaporozhets aded7056fd Merge pull request #1313 from LeonB/master 
Fixed some hardcoded paths based on issue #1272
 2012-08-28 07:00:55 -07:00
LeonB ffdda12f66 Line not needed anymore 2012-08-28 14:18:49 +02:00
Dmitriy Zaporozhets aa708ed961 Simplify setup for nginx, initd with already predefined files 2012-08-28 13:47:13 +03:00
Tiago Ribeiro 7a16572c0a Fixed typo 2012-08-28 12:09:10 +02:00
LeonB c81d4ab4a9 Fixed some hardcoded paths 
New config option: git_hooks_path
 2012-08-28 10:57:23 +02:00
randx 867f46076e No need to chown hooks in backup script any mroe 2012-08-26 01:40:01 +03:00
Dmitriy Zaporozhets 2e836fa428 Merge pull request #1274 from wiggle/bulk_permissions_tasks 
Rake tasks to assign permissions to users
 2012-08-27 11:50:26 -07:00
Dmitriy Zaporozhets 607be412d4 Merge pull request #985 from timspin/fix-gitolite-refs 
Adds refs to gitolite.conf with $ at the end
 2012-08-27 11:13:13 -07:00
Seif Attar 2d6a3e6b67 Task to assign user developer role to all projects 2012-08-23 10:48:55 +01:00
Seif Attar 22ec463764 rake task to add all users to all projects 2012-08-23 10:48:45 +01:00
Robert Speicher b838440f15 Deprecate the DELETE method for Issues API 
Now returns HTTP Status 405 - http://httpstatus.es/405

Closes #1245
Closes #1264
 2012-08-22 13:26:09 -04:00
Robert Speicher 0f1ca8b3e7 Remove DELETE API for Milestones 2012-08-22 13:19:55 -04:00
Riyad Preukschas 32ae7fb616 Improve GFM code documentation 2012-08-23 20:10:06 +02:00
randx d1daeba173 Updated app:status & docs with hooks. Removed write_hooks from app:setup 2012-08-21 22:45:14 +03:00
randx c625293b99 Handle post-receive files via gitolite, not gitlab 2012-08-21 20:14:06 +03:00
randx 8e3a2def8a Project /lib cleanup 2012-08-19 11:44:48 +03:00
randx d4059ac966 Move graph_commit under gitlab module 2012-08-19 10:58:10 +03:00
Dmitriy Zaporozhets 813814f02e Application cleanup 2012-08-17 09:09:11 +03:00
Robert Speicher b0a901fe01 Add API for Milestones 2012-08-16 14:52:42 -04:00
Robert Speicher 66399d558d Merge branch 'master' into hooray_apostrophes 2012-08-16 14:03:06 -04:00
Robert Speicher b039a16946 GFM refactor: Move the actual parsing to a class under the Gitlab module 2012-08-14 04:37:18 -04:00
Robert Speicher 6af38f5145 "Cant" -> "Can't" 2012-08-13 21:02:40 -04:00
Dmitriy Zaporozhets 463644c882 rspec to capybara-webkit. simplercov now use cucumber 2012-08-13 08:32:10 +03:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax 
Didn't bother with files in db/, config/, or features/
 2012-08-10 18:25:15 -04:00
Riyad Preukschas 8e6a7a172e Merge branch 'master' into gitlab-flavored-markdown 2012-08-06 01:48:20 +02:00
Dmitriy Zaporozhets 9b5441bce7 Merge pull request #1152 from natrim/master 
Fix UMASK checking in .gitoliterc
 2012-08-03 23:27:31 -07:00
Riyad Preukschas 24ec186a83 Update Gitlab Markdown renderer to use GFM 2012-08-02 02:54:05 +02:00
Riyad Preukschas e1b4e22e5c Add render context to markdown renderer 2012-08-01 17:37:12 +02:00
Nihad Abbasov 058b71edf3 API: set content type for raw snippet 2012-08-01 05:57:56 -07:00
Nihad Abbasov 853ca74620 fix typo according to docs and tests 2012-08-01 05:48:15 -07:00
Jeremy Anderson 69c4cea65a updating project api to include raw blob contents and single branch 2012-07-31 07:32:44 -07:00
Michael van Rooijen 19f7b038cb Post-receive hook should be owned by gitlab user, not git. 2012-07-27 15:30:36 +02:00
natrim 5cb47b761c fix checking for right gitolite UMASK 2012-07-27 12:03:30 +03:00
Dmitriy Zaporozhets 67ef96ea5f Merge pull request #1129 from meskyanichi/master 
Potential solution for current `rake gitlab:app:backup_restore` issues.
 2012-07-26 23:11:46 -07:00
Michael van Rooijen ec01cbef94 Modified the repo_dump and repo_restore rake tasks to properly dump and restore repositories based on their path rather than their (project) name. The project name can be uppercase and may contain spaces. This caused the repository to be restored as a different path that it was initially created as, thus, breaking the git remote and the web interface can no longer detect the repository either because it searches by path and not by name. Also, when restoring the permissions are incorrect making it impossible to push new commits to the remote repository. So now on success it'll set the correct permissions (but requires that the gitlab user has sudo privileges, or this task must be executed as root). 2012-07-26 21:30:10 +02:00
randx 18f83016b1 Fixed persmission issue in doc. Added validation of hooks in gitlab:app:status 2012-07-26 16:14:34 +03:00
Nihad Abbasov cb32e0320a return 404 if project not found 2012-07-25 05:24:28 -07:00
Nihad Abbasov f7dd067490 API: expose issues project id 2012-07-25 04:22:21 -07:00
Nihad Abbasov 949b1df930 API: update docs 2012-07-25 02:35:41 -07:00
Nihad Abbasov 1b95c8bff3 API: ability to get project by id 2012-07-25 02:18:30 -07:00
Dmitriy Zaporozhets 60d3e94874 Merge pull request #1122 from patthoyts/pt/missing-log 
Create the githost.log file if necessary.
 2012-07-25 01:50:34 -07:00
Nihad Abbasov eca823c1c7 Merge branch 'master' into api 2012-07-24 05:46:36 -07:00
Nihad Abbasov 7b33d8cbca add issues API 2012-07-24 05:19:51 -07:00
Pat Thoyts 6035ad7e1f Create the githost.log file if necessary. 
This resolves issue #1121.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-21 15:32:04 +01:00
Michael Richardson 0456ceddb4 Fixing MySQL syntax error 2012-07-18 11:59:32 +01:00
Dmitriy Zaporozhets 8803350023 CHANGELOG updated. Fixed MR bug. Logger improved 2012-07-17 08:23:16 +03:00
Dmitriy Zaporozhets 2a705c4f40 Admin logs improved. Commits list box styled 2012-07-16 08:03:10 +03:00
Stefan Morgenthaler 4dae41d5dc Changes done as per feedback 2012-07-10 16:12:19 +02:00
Stefan Morgenthaler 12b34c8115 add: rake task to backup/restore gitlab db and repos 2012-07-10 00:01:05 +02:00
Nihad Abbasov 0f604e62fb refactor projects API 2012-07-06 06:36:43 -07:00
Dmitriy Zaporozhets d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00
Dmitriy Zaporozhets bf519f64b0 Merge pull request #1043 from NARKOZ/api 
API docs
 2012-07-05 09:23:24 -07:00
Nihad Abbasov efa21573df return 404 when record not found 2012-07-05 08:12:09 -07:00
Nihad Abbasov 5f38f67247 don't expose full user info unless needed 2012-07-05 06:47:00 -07:00
Dmitriy Zaporozhets 4e0c2f00d3 Merge pull request #1026 from gitlabhq/inline_diff 
Inline diff
 2012-07-04 22:45:52 -07:00
Valeriy Sizov e3fed8aaf4 InlineDiff: fix bug "unmatched close parenthesis" 2012-07-05 00:57:12 +03:00
Dmitriy Zaporozhets 3ce629fded Merge pull request #1034 from NARKOZ/api 
API version
 2012-07-04 08:36:06 -07:00
Nihad Abbasov 61910eb8fa ability to update and get a raw snippet via API 2012-07-04 02:03:32 -07:00
Nihad Abbasov fbd559d44f add API version 2012-07-04 00:48:00 -07:00
Valeriy Sizov 00bc0e2577 InlineDiff: small cleaning 2012-07-02 23:39:38 +03:00
Valeriy Sizov cecdb0b384 InlineDiff: refactoring 2012-07-02 23:34:25 +03:00
randx 1d543e6430 Finished with configs 2012-07-02 21:59:48 +03:00
Dmitriy Zaporozhets a2eda66b30 Disable issues sort. Recent issues on top. Fixed tests 2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets 9b337b8328 Epic: Gitlab configuration with default values 2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets b110c6bc86 Merge pull request #1019 from NARKOZ/api 
API
 2012-06-29 06:45:41 -07:00
Nihad Abbasov 378dc55d29 add project snippets API 2012-06-29 06:34:08 -07:00
Dmitriy Zaporozhets 318350e34f Merge branch 'api' of https://github.com/NARKOZ/gitlabhq 
Conflicts:
	Gemfile.lock
 2012-06-29 14:25:20 +03:00
Nihad Abbasov 1d2c981860 return errors in json format 2012-06-29 03:52:20 -07:00
Nihad Abbasov 0d67f209fc refactor API and improve docs 2012-06-29 03:46:01 -07:00
Nihad Abbasov 84a3f8fca4 show only current user projects 2012-06-28 07:02:20 -07:00
Nihad Abbasov 7b5c3cc8be add projects API 2012-06-28 03:44:20 -07:00
Nihad Abbasov 4ad91d3c11 add users API 2012-06-28 03:43:41 -07:00
Nihad Abbasov 4aca61e8a6 install grape and mount Gitlab::API 2012-06-28 03:42:58 -07:00
timspin 0ce7ad57b7 Adds refs to gitolite conf with $ at the end 2012-06-27 00:08:13 +06:00
Denis Peplin 4a40f65090 Replace hardcoded '/home/git/repositories/' with GIT_HOST['base_path'] 2012-06-25 08:54:02 +04:00
Dmitry Kalinkin f33a80a522 #909 fix network graph json generation 2012-06-19 17:29:31 +04:00
randx f909e25d1b Improve gitlab encode method 2012-06-17 22:00:13 +03:00
randx 60db88ad34 Lets change how cucumber run on travis 2012-06-17 18:40:00 +03:00
randx cd3f55a310 Fix travis 2012-06-17 18:33:13 +03:00
randx 67f445afea fixed type 2012-06-16 13:31:21 +03:00
randx 8189082e4c fix ci run 2012-06-16 13:20:17 +03:00
Dmitriy Zaporozhets 5bbf3ccf05 Cucumber: 
* Profile
* Browse code
* Sceleton for main features
* Wiki
* Commits
 2012-06-15 07:15:28 +03:00
randx 04bf40a923 Refactored theme css, added Modern theme pre version 2012-06-11 20:52:32 +03:00
Nihad Abbasov 604725f4f1 specify utf-8 encoding for pygments.rb markdown wrapper 2012-06-08 01:23:31 -07:00
Zevs d6ed9920d6 #888 prevent to remove source_branch 2012-06-05 00:11:07 +03:00
Zevs 3b41b1839b ability to remove source branch after merge 2012-06-05 00:11:07 +03:00
Zevs 3ffb9cbfa9 Task#879 Relocated gitolite repo and lock file 2012-06-04 21:41:26 +03:00
Sven Amonat 6f229c4fb2 - fix bash path 2012-05-31 15:19:48 +02:00
Dmitriy Zaporozhets 2cf8010792 Merge pull request #868 from SaitoWu/bugfix/encoding 
Bugfix/encoding
 2012-05-30 00:24:43 -07:00
Saito e851cb0776 must force_encoding to utf-8 first 2012-05-30 13:40:47 +08:00
Saito c62715acc9 now render the correct authorname and message 2012-05-30 12:11:03 +08:00
Saito c71a76e71a fix graph problem if authorname or message isnot utf8 encoding 2012-05-30 11:47:26 +08:00
Saito efd9a717c1 solve the binary problem 2012-05-30 11:44:36 +08:00
Nihad Abbasov f01994e1f8 move assets from lib directory to vendor 
[ci skip]
 2012-05-29 17:56:48 +05:00
Saito 206230a4ec rewrite encode strategy. 2012-05-29 16:16:59 +08:00
randx d72f8db08a Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_encoding 
Conflicts:
	lib/gitlab/encode.rb
 2012-05-27 12:20:35 +03:00
Gabriel Mazetto 11f90ae42e Forgot to refactor a line on lib/gitlabhq/encode.rb 2012-05-26 23:19:37 -03:00
Gabriel Mazetto 50c2c16a4d Better algorithm to deal with encodings. Moved fallback rescue message from view to encode library. 
This helps fix cases where UTF-8 is wrongly identified as ISO-8859-1. We will only try to convert strings if we are 100% sure about the charset, otherwise, we will fallback to UTF-8.
 2012-05-26 20:15:06 -03:00
randx d29ec9d773 Images refactored, Feed icon replaced, Fixed comment form focus 2012-05-27 01:12:28 +03:00
Gabriel Mazetto 39def0dcbb Better fix for encoding problems on rendering of inline file visualizations like README files. 2012-05-26 15:56:11 -03:00
Gabriel Mazetto eb5749ed39 Fixed encoding problems with plain/text blobs being sent without charset. 2012-05-26 15:55:53 -03:00
randx 3272620f72 lib/ refactoring. Module Gitlabhq renamed to Gitlab 2012-05-26 13:37:49 +03:00
Dmitriy Zaporozhets cc8369144d Prevent app crash in case if encoding failed 2012-05-22 14:57:04 +03:00
Dmitriy Zaporozhets 1b2068eaa9 Gem updates & githost logger 
* Grit gem updated
* gitolite-client updated
* logger added
* few fixes
 2012-05-21 23:17:41 +03:00
Zevs c937d06c3c Task#755 auto-merge don`t work correctly. 2012-04-30 00:23:19 +03:00
Valery Sizov 903f9491ba MR: change path to lock file 2012-04-27 01:09:23 +03:00
Thomas A. de Ruiter b53df22127 Rescue from CharlockHolmes failure 2012-04-24 12:43:06 +02:00
Ariejan de Vroom 21f3da2358 Make sure tmp/merge_repo is available to write lock files for auto-merge. 2012-04-23 10:54:19 +03:00
Dmitriy Zaporozhets 204c66461e corrected exception for automerge 2012-04-22 16:49:45 +03:00
Valery Sizov e5f8397fd4 fast automerge: done 2012-04-22 16:14:01 +03:00
Valery Sizov dcbb875c46 fast automerge: base implementation 2012-04-22 15:19:09 +03:00
Dmitriy Zaporozhets ae565d24ee Increased automerge timeout. Works for 300 commits MR on repo with 200MB size 2012-04-21 13:23:44 +03:00
Dmitriy Zaporozhets 7058258a2a Fixed db_schema & reordered rake tasks 2012-04-21 12:45:43 +03:00
Dmitriy Zaporozhets 08994f3f60 Merge remote-tracking branch 'origin/merge_button' 
Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb
 2012-04-21 12:22:56 +03:00
Dmitriy Zaporozhets 9cb51c6ea2 Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown 
Conflicts:
	Gemfile
	Gemfile.lock
 2012-04-21 01:44:15 +03:00
Arthur Schreiber 5b6019f357 Using github's linguist to better detect filetypes and to do syntax highlighting. 2012-04-20 23:21:12 +02:00
Arthur Schreiber c437e2d7d4 Switch to Redcarpet for Markdown Rendering. 
This gives us Github Flavored Markdown, which is awesome.
 2012-04-20 23:01:45 +02:00
Valery Sizov 3a6694b551 Auto-merge: reise exception when gitlab do not have access to repo 2012-04-16 23:49:57 +03:00
Valery Sizov 5abbada41e Auto-merge: implemented lock file 2012-04-16 23:37:04 +03:00
Valery Sizov 8269a3a735 Auto-merge: checking via AJAX 2012-04-16 22:08:03 +03:00
Dmitriy Zaporozhets b7558a2063 Removed encoding monkey patch 2012-04-11 23:03:56 +03:00
Dmitriy Zaporozhets 43f5df21a3 gitlab rake tasks refactored 2012-04-04 01:02:54 +03:00
Dmitriy Zaporozhets 90748cf724 Merge Button v1 complete 2012-03-30 20:49:34 +03:00
randx 464cd59dff Rake task to provider full repo access for gitolite-owner.\n Automerge requires gitlab user be able to push to any repo 2012-03-30 08:25:04 +03:00
randx 411d84f385 Better merge handling. show if MR can be accepted or not 2012-03-30 08:05:04 +03:00