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

763 commits

Author SHA1 Message Date
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
randx
78d620b3b6 Raw gitlab automerge feature 2012-03-29 18:03:05 +03:00
Dmitriy Zaporozhets
0fe36374d8 Better language detection 2012-03-13 21:07:30 +02:00
Valery Sizov
0592b6a864 graph: fix unicode issue #525 2012-03-12 15:39:41 +02:00
Dmitriy Zaporozhets
d63339ec2f fix update_hooks task 2012-03-11 10:47:30 +02:00
Dmitriy Zaporozhets
9988282e84 Diasgnostic task for gitlab 2012-03-09 20:48:33 +02:00
Dmitriy Zaporozhets
cb59aade4e Cleaning and refactoring 2012-03-06 00:26:40 +02:00
Dmitriy Zaporozhets
bb164ebf1b Send author to post hook. Display push activity to dashboard 2012-02-29 22:38:24 +02:00
Dmitriy Zaporozhets
37224dc9c1 ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only 2012-02-15 22:02:33 +02:00
Pedro Rodrigues
a9fc97db46 Add syntax highlighting for D and Haskell 2012-02-14 20:46:56 +00:00
Dmitriy Zaporozhets
7b0cd969e0 Merge branch 'web_hooks_scaffold' 2012-01-08 13:20:56 +02:00
Valery Sizov
26fd3e69c9 clickable point in graph 2012-01-07 13:21:35 +02:00
Valery Sizov
ac62036320 fixed bug #316 2012-01-04 01:21:30 +02:00
Dmitriy Zaporozhets
495deea7eb fixed queue name 2012-01-04 01:09:48 +02:00
shtirlic
2eb56e3d18 Delete .directory files 2012-01-01 21:37:32 +04:00
Saito
14023c4e5a remove charencode. 2011-12-30 21:41:39 +08:00
Saito
7279e8c177 Revert "merge charlock_holmes to master" 
This reverts commit a25a85b939.
 2011-12-30 18:30:57 +08:00
Saito
a25a85b939 merge charlock_holmes to master 2011-12-29 11:52:28 +08:00
Valery Sizov
66fb3909a5 Merge branch 'web_hooks' of https://github.com/ariejan/gitlabhq into ariejan-web_hooks 
Conflicts:
	app/models/project.rb
	config/routes.rb
	db/schema.rb
 2011-12-27 23:21:26 +02:00
Jeremy Mack
8a1deea586 Fixes timeout when adding an SSH key 
Users with many projects (>100) will hit the 20 second timeout when
updating the gitolite config. This fix batches those changes into a
signle update to the file, causing an order of magnitude speed increase
which finishes well below the 20 second timeout.

Fixes gitlabhq/gitlabhq#220
 2011-12-20 10:07:55 -05:00
Dmitriy Zaporozhets
f7859ec1ed rake dev_repo: fixed for ubuntu 2011-12-16 01:59:07 -08:00
Dmitriy Zaporozhets
ced572c328 Merge pull request #196 from mutewinter/bulk_repo_import 
Bulk repo import Rake task
 2011-12-16 00:59:07 -08:00
Jeremy Mack
3fd3e1fcdf Added detection and handling of exsiting repos 2011-12-15 16:55:53 -05:00
Dmitriy Zaporozhets
d9cfb7985e dev seeds & dev scripts 2011-12-15 23:04:59 +02:00
Jeremy Mack
60fee48eaa Better description for automatically created project 2011-12-13 13:25:01 -05:00
Saito
a1cd582c67 fix can not guess problem 2011-12-13 13:20:45 -05:00
Jeremy Mack
2201ef8020 Add rake task for bulk repo importing 
Git repos should be in the import_projects directory in the root of
application. The task is invoked via @rake import_projects@.
 2011-12-13 13:20:40 -05:00
Jeremy Mack
e38fa32822 Calling update_repository 
- Better comment too
 2011-12-13 13:17:54 -05:00
Ariejan de Vroom
bc0155fbaa First attempt at a post-receive hook that posts directly to Resque 2011-12-13 01:03:26 +01:00
Ariejan de Vroom
1c9b9b7a3b Added Resque as a dependency 2011-12-12 23:03:38 +01:00
Saito
f615c877bc fix can not guess problem 2011-12-13 00:41:31 +08:00
Dmitriy Zaporozhets
d68ec5e0fb default_branch for project & fixed project destroy 2011-12-07 23:56:57 +02:00
Dmitriy Zaporozhets
cb021e5831 repo & project access separated. critical gitolite bugfix 2011-12-07 01:27:07 +02:00
Dmitriy Zaporozhets
e14a0eb8d0 Merge branch 'gitolite' 2011-12-05 19:27:51 +02:00
Dmitriy Zaporozhets
2d81f4880e keys migrate 2011-12-05 19:27:41 +02:00
Saito
e3402769f3 refator handle_file_type. add velocity jade c header and others syntax detect 2011-12-05 18:21:44 +08:00
Dmitriy Zaporozhets
bdc658095c refcatoring. cleaning after gitosis 2011-12-05 09:43:53 +02:00
Dmitriy Zaporozhets
8134fe0efe git host fixed 2011-12-05 09:23:53 +02:00
Dmitriy Zaporozhets
9e089efe5a gitolite & gitosis support 2011-12-04 01:44:59 +02:00
Dmitriy Zaporozhets
c03bc6e291 gitolite support in progress | requires gitolite umask 0007 2011-12-04 01:08:08 +02:00
Saito
42ba6d04f8 refactor each_line detect to detect all diff file 2011-12-01 15:59:49 +08:00
Saito
12c01d7401 fix encode bugs on diff not utf-8 encode's code 2011-11-30 15:05:37 +08:00
Saito
46cbe54189 fix the issue on github #157. 
directly force_encoding is wrong,
must detect the file string's encoding.
then force_encoding the string to it's encoding.
last convert it to utf-8.
 2011-11-28 17:46:41 +08:00
Dmitriy Zaporozhets
a031813887 Commit, network graph refactoring 2011-11-27 17:35:49 +02:00
Saito
26bdeb2107 commit safe_commit 2011-11-18 10:55:08 +08:00
gitlabhq
37346ead30 travis 2011-11-15 08:42:01 -05:00
Nihad Abbasov
368deb5992 clean up whitespace from project 2011-11-15 12:34:30 +04:00
Valery Sizov
762946995e Merge remote-tracking branch 'origin/master' into network_graph 
Conflicts:
	app/assets/stylesheets/projects.css.scss
	lib/commit_ext.rb
 2011-11-13 15:57:34 +02:00
Valery Sizov
dc844f0138 Graph: small refactoring 2011-11-13 15:31:18 +02:00
Valery Sizov
c89682605f Graph: is done. v1 2011-11-13 15:12:52 +02:00
Valery Sizov
94690bd2c4 Graph: base implementation 2011-11-13 13:58:45 +02:00
Valery Sizov
6b66a766d1 Graph: build json 2011-11-13 00:30:51 +02:00
Dmitriy Zaporozhets
4dd5d9c8cc Issue #185 – Show branch name for commits on activities & dashboard pages 2011-11-12 15:18:56 +02:00
gitlabhq
3abd977822 fixed error with ascii error for dashboard 2011-11-03 06:56:26 -04:00
gitlabhq
485c5199b7 user dashboard 2011-10-31 22:57:16 +02:00
Nihad Abbasov
d62200cad4 clean-up code 
* Remove trailing whitespace
  * Converts hard-tabs into two-space soft-tabs
  * Remove consecutive blank lines
 2011-10-26 18:46:25 +05:00
gitlabhq
afe98ae74a Issue #149 fixed 2011-10-25 07:32:02 +03:00
gitlabhq
5baa5fad0a Issue #149 2011-10-24 22:38:03 +03:00
gitlabhq
b3279b9b51 moved from albino -> pygments.rb 2011-10-22 14:08:03 +03:00
gitlabhq
c7ccfb9a9d low case 2011-10-22 14:07:09 +03:00
VSizov
6d6eefa0e2 fix remove repo 2011-10-22 13:50:02 +03:00
Valery Sizov
da48ca5891 Issue #135 - Repository stay after project remove 2011-10-21 00:52:49 +03:00
gitlabhq
c463eeb090 refactoring 2011-10-20 22:00:00 +03:00
gitlabhq
5a5845e490 few fixes 2011-10-18 11:21:44 +03:00
gitlabhq
8a8e77d54f update.rb 2011-10-17 18:45:31 +03:00
gitlabhq
2cd52b492a install & update 2011-10-14 16:40:41 +03:00
gitlabhq
29149848d4 fix gitosis log error 2011-10-13 15:57:26 +03:00
gitlabhq
0f6ebcb694 v1.0 2011-10-13 04:00:00 +03:00
gitlabhq
162c4b044e issue #94 2011-10-11 00:07:40 +03:00
gitlabhq
ec9e54ea94 gitosis error handle 2011-10-10 00:15:28 +03:00
Valera Sizov
819818ad74 clear comment 2011-10-08 15:33:36 -07:00
Valera Sizov
e93f1603f5 transition to gem git 2011-10-08 15:33:36 -07:00
gitlabhq
9ba1224867 init commit 2011-10-09 00:36:38 +03:00