home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 21:46:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij 90d7ac3b9e Merge branch 'deeplink' into 'master' 
Deeplink

/cc @dzaporozhets
 2014-03-17 13:37:33 +00:00
dosire 67eb14d308 We have html targets for paragraphs now. 2014-03-17 14:36:20 +01:00
Dmitriy Zaporozhets 0f204c3222 Merge branch 'project-permissions' into 'master' 
API: Project permissions
 2014-03-17 13:30:28 +00:00
Dmitriy Zaporozhets 63a8af677a Merge branch 'split-api-files' into 'master' 
Move project members api to separate file
 2014-03-17 13:30:10 +00:00
Dmitriy Zaporozhets c02e3d441b Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:29:45 +02:00
Dmitriy Zaporozhets 86c76eccea Add more api docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:22:39 +02:00
Dmitriy Zaporozhets 928b7f3bff Add tests for API project permissions info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:14:27 +02:00
Dmitriy Zaporozhets 0ea0e542a9 Remove old entities 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 14:35:50 +02:00
Dmitriy Zaporozhets eea317795e Add current user permissions info to /api/projects/:id.json 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 14:33:41 +02:00
Dmitriy Zaporozhets a91a6491bf Use new grape-entity gem with fixed nested entities 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 14:33:21 +02:00
Marin Jankovski 656d9548bc Update markdown documentation, fix wiki spec. 2014-03-17 13:23:04 +01:00
Marin Jankovski 3f818a3d58 Update wiki tests. 2014-03-17 13:06:27 +01:00
Marin Jankovski f04d5bfaf6 Wiki will show relative links related to the wiki gollum repository. 2014-03-17 13:06:19 +01:00
Marin Jankovski 55e2f353d4 Link to blob instead of linking to wiki. 2014-03-17 13:05:20 +01:00
Ciro Santillli 548f070f0e Show link to public projects for new users. 2014-03-17 13:02:04 +01:00
Dmitriy Zaporozhets 7c60713e82 Move project members api to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 13:44:54 +02:00
Dmitriy Zaporozhets 7bce8748a4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-03-17 13:30:23 +02:00
Dmitriy Zaporozhets 788723c39e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-17 13:30:06 +02:00
Dmitriy Zaporozhets c0d2b976ca Restore old travis.yml 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 13:29:51 +02:00
Dmitriy Zaporozhets a7ac57a1a3 Merge pull request #6534 from dlorch/master 
JIRA project identifiers may also contain dashes '-'
 2014-03-17 13:28:39 +02:00
Sytse Sijbrandij a2ab57e9a6 Merge branch 'update/changelog' into 'master' 
Update/Changelog

Update the changelog to add the remaining 6.6.X entries
 2014-03-17 06:47:07 +00:00
Arif Ali cfabaa8bd5 update changelog, add remainder 6.6.X changlog entries 2014-03-17 00:01:14 +00:00
Dmitriy Zaporozhets 36c094b08d Merge branch 'gmessner/gitlab-ce-issue-110' 2014-03-16 09:43:41 +02:00
Dmitriy Zaporozhets fddbd7b2f0 Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into gmessner/gitlab-ce-issue-110 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-03-16 09:43:25 +02:00
Dmitriy Zaporozhets f3220ababb Merge branch 'dev-seeds' into 'master' 
Improve developer seeds
 2014-03-16 07:40:34 +00:00
Kei ac09f6deb9 Fixed some minor typos. 2014-03-16 03:45:00 +08:00
Dmitriy Zaporozhets 39f80884db Improve developer seeds 
Return execution of observers in seeds.
Mute email sending to letter opening in you browser.
Added `rake dev` task to reset db and add seeds.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-15 11:39:35 +02:00
Dmitriy Zaporozhets 6e73b208a9 Add comments fixtures for development 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-15 10:23:48 +02:00
Dmitriy Zaporozhets ecae936d34 Merge branch 'batch_key_import' into 'master' 
Batch Key Import
 2014-03-15 06:28:44 +00:00
Dmitriy Zaporozhets 66a484c9cd Merge branch 'improve-project-lookup' into 'master' 
Improve Project Lookup

Fixes #1080
 2014-03-15 06:27:15 +00:00
Dmitriy Zaporozhets 7c5320d2c8 Merge branch 'snippets-page' into 'master' 
Render 404 instead of 500 if trying to see snippets of unexisting user

Fixes #1087
 2014-03-14 21:10:12 +00:00
Dmitriy Zaporozhets f84d015fa9 Fix commit comment count css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 23:09:43 +02:00
Christian Höltje 901976d972 Switched line endings to LF for system_hooks.md 
It was checked in with Windows style line endings.
 2014-03-14 14:53:43 -04:00
Daniel Lorch 686128cd68 JIRA project identifiers may also contain dashes '-' 2014-03-14 18:08:05 +01:00
Jacob Vosmaer 4aa3ce7534 Add check for orphaned UsersGroups 2014-03-14 17:25:11 +01:00
Jacob Vosmaer 090ed21e6f Batch key import requires gitlab-shell 1.8.5 2014-03-14 15:58:47 +01:00
Jacob Vosmaer 779fa4a7b7 Use batch_add_keys in rake gitlab:shell:setup 2014-03-14 15:49:11 +01:00
Dmitriy Zaporozhets a9f2903e86 Change project lookup order for api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 15:58:52 +02:00
Dmitriy Zaporozhets 25f68a71d6 Project must have namespace for Project#find_with_namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 15:58:10 +02:00
Dmitriy Zaporozhets a39eeba1dc Render 404 instead of 500 if trying to see snippets of unexisting user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 15:55:41 +02:00
Dmitriy Zaporozhets 17a9ecf8cf Remove confusing code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 14:43:50 +02:00
Dmitriy Zaporozhets e07b2f527f Fix global search 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 14:41:28 +02:00
Dmitriy Zaporozhets 02b310dffb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-03-14 14:23:42 +02:00
Dmitriy Zaporozhets fa3c087a4c Clear rake task only if defined 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 14:23:28 +02:00
Dmitriy Zaporozhets 00815dd4a2 Merge branch 'new_lines_markdown' into 'master' 
New Lines Behaviour in Markdown

Per markdown specification, only render line-breaks when you end a line with two or more spaces.
 2014-03-14 12:16:44 +00:00
Marin Jankovski ccc14fa21c Add to changelog changes for markdown. 2014-03-14 12:33:22 +01:00
Marin Jankovski f3ceebad42 Ignore newlines per md standard. 2014-03-14 12:33:03 +01:00
Dmitriy Zaporozhets b5d81174fb Fix mr process order on push. 
First close merge requests that being merged. Then update code of open
mr. This fixes bug when MR merged via command line lose their diff
because code reload was before MR close.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 13:02:55 +02:00
Dmitriy Zaporozhets 1ec106b853 Merge branch 'ldap_connections' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-03-14 12:58:43 +02:00
Dmitriy Zaporozhets bce8edbbcc Require gitlab-shell v1.8.4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 12:57:26 +02:00