Commit graph

177 commits

Author SHA1 Message Date
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