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
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