Commit graph

3392 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
10b312abad Merge pull request #2494 from dvanduzer/4-0-stable
updating rails to 3.2.10 in response to CVE-2012-5664
2013-01-06 03:16:32 -08:00
David Van Duzer
260ab8d67a updating rails to 3.2.10 in response to CVE-2012-5664
See also:
https://github.com/gitlabhq/gitlabhq/issues/2464
http://www.securityfocus.com/bid/57084
2013-01-06 00:46:40 -07:00
Dmitriy Zaporozhets
708a0d421e Fixed and improved enable_naamespace migration task 2012-12-28 06:14:05 +03:00
Dmitriy Zaporozhets
779e95b503 Merge pull request #2401 from Philzen/4-0-stable
Fix for Postgresql Migration 3.1 --> 4.0
2012-12-27 06:59:28 -08:00
Phil. Austermann
91405d1f98 - Fix PostgreSql Migration issue to 4.0 (fixes https://github.com/gitlabhq/gitlabhq/issues/2398) 2012-12-27 11:03:54 +01:00
Dmitriy Zaporozhets
2edb16612f Cleanup service tasks 2012-12-27 11:18:05 +02:00
Dmitriy Zaporozhets
c68540e9c9 Fix resque for postgres 2012-12-26 19:56:56 +02:00
Dmitriy Zaporozhets
19cb29e448 Fix MR count for group scope 2012-12-26 10:56:51 +02:00
Dmitriy Zaporozhets
45b6103997 Update projects in gitolite after namespace moved. Added rake task to cleanup garbage from gitolite 2012-12-24 20:06:37 +02:00
Riyad Preukschas
8ef7b9b6d1 Make SQLite check in gitlab:check more robust 2012-12-24 16:45:10 +01:00
Riyad Preukschas
0e15270b75 Fix crash in gitlab:check while checking hooks 2012-12-24 16:45:08 +01:00
Riyad Preukschas
d9ca1bce7a Fix paths in gitlab:check 2012-12-24 16:45:03 +01:00
Riyad Preukschas
a9e2fa4c35 Fix output of gitlab:check 2012-12-23 20:51:27 +01:00
Riyad Preukschas
3bf0b4e25b Fix satellite check for projects with empty repo
Fixes #2349
2012-12-23 20:51:27 +01:00
Dmitriy Zaporozhets
02a29d1db4 Merge branch '4-0-stable' into stable 2012-12-23 14:02:47 +02:00
Dmitriy Zaporozhets
6a932d0af5 Add missing cd 2012-12-23 13:58:41 +02:00
Dmitriy Zaporozhets
f314d3e68f Fix installation docs 2012-12-23 13:57:40 +02:00
Dmitriy Zaporozhets
e440da62b8 Let it be v4.0.0 2012-12-23 12:12:31 +02:00
Dmitriy Zaporozhets
25c33ca3d0 Fix webhook data sample 2012-12-23 01:14:04 +02:00
Dmitriy Zaporozhets
3ff131a747 Improve web hook data. Use clonable url in repo info 2012-12-23 01:10:57 +02:00
Dmitriy Zaporozhets
0af5884bcd gitlab.yml how to use section 2012-12-23 00:49:46 +02:00
Dmitriy Zaporozhets
86ed2e8f17 Fixed MR count on dashboard 2012-12-23 00:39:42 +02:00
Dmitriy Zaporozhets
3933930538 Sctrict host instructions 2012-12-23 00:35:52 +02:00
Dmitriy Zaporozhets
60038a99ca Import: Skip if not git repo 2012-12-23 00:18:39 +02:00
Dmitriy Zaporozhets
fa8f834374 Fix import rake task and tests 2012-12-23 00:15:48 +02:00
Dmitriy Zaporozhets
9f595aa42f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-12-22 23:45:37 +02:00
Dmitriy Zaporozhets
328e0d80ca Log if satellite creation failed 2012-12-22 23:45:22 +02:00
Riyad Preukschas
68c43d59f0 Add instructions to fix permissions for /home/git/.gitolite/ 2012-12-22 22:22:51 +01:00
Riyad Preukschas
5d1044c335 Fix Commit#to_diff 2012-12-22 20:36:33 +01:00
Riyad Preukschas
056fa05b86 Remove path parameter from projects API 2012-12-22 20:06:18 +01:00
Dmitriy Zaporozhets
1ba28aaef8 Implement UsersProject project_access validation 2012-12-22 19:52:28 +02:00
Riyad Preukschas
640018ba55 Fix docs to download and compile Ruby in /tmp/ruby 2012-12-22 15:52:42 +01:00
Riyad Preukschas
c926a2b6ee Remove bundler calls from databases.md
GitLab is not yet downloaded at this point in the installation guide.
2012-12-22 15:33:22 +01:00
Riyad Preukschas
cc42bf784e Fix sudo install command in installation guide
Fixes #2334
2012-12-22 15:16:16 +01:00
Dmitriy Zaporozhets
988e6ac205 Fix #2220 2012-12-22 14:34:38 +02:00
Dmitriy Zaporozhets
2398af9ab0 Fixed wierd gitlab markdown issue 2012-12-22 14:18:40 +02:00
Dmitriy Zaporozhets
cec866a7ce Improve wiki rendering. Fix pygemnt + markdown invalid html 2012-12-22 13:01:15 +02:00
Dmitriy Zaporozhets
ed35ea703c Fix order of db setup in installation docs 2012-12-22 12:01:54 +02:00
Dmitriy Zaporozhets
a7b572d0ab Fixed #2333 2012-12-22 11:59:05 +02:00
Dmitriy Zaporozhets
8fe58ed541 Merge pull request #2330 from gitlabhq/v4.0-api-fixes
V4.0 API fixes
2012-12-22 00:43:17 -08:00
Dmitriy Zaporozhets
86673a66b7 Fix fark background highlight 2012-12-21 23:22:52 +02:00
Riyad Preukschas
eaa99478a7 Up API version to v3 2012-12-21 18:55:39 +01:00
Riyad Preukschas
8f01190eb5 Remove all references tp the project code parameter from the API 2012-12-21 18:47:04 +01:00
Riyad Preukschas
931ec399bd Remove the code parameter from the projects API 2012-12-21 18:43:46 +01:00
Dmitriy Zaporozhets
b510f8c496 Fixed tests 2012-12-21 13:37:44 +02:00
Dmitriy Zaporozhets
4398bdf2c9 Merge branch 'koenpunt-gh-issue-1509' 2012-12-21 13:07:47 +02:00
Dmitriy Zaporozhets
a47032bc29 Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509
Conflicts:
	vendor/assets/javascripts/branch-graph.js
2012-12-21 13:07:34 +02:00
Dmitriy Zaporozhets
a567d596f8 Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
Fix and refactoring gfm_autocomplete
2012-12-21 02:47:55 -08:00
Riyad Preukschas
0efc903eef Fix text in project move mail 2012-12-20 22:25:42 +01:00
Dmitriy Zaporozhets
4b649c2f4d Release candidate 1 2012-12-20 23:12:38 +02:00