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