home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,023 Commits 48 Branches 340 Tags
44b3404e80dd286931992a7dfa6d0fb6bbab0a17
Commit Graph
9023 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 44b3404e80 Merge branch 'code-from-ce-6-7' into 'master' 
Code from CE 6.7

Fixes #75
 2014-03-18 10:13:20 +00:00
Dmitriy Zaporozhets 896159caac Update db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-18 11:18:34 +02:00
Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb
 2014-03-18 11:15:01 +02:00
Dmitriy Zaporozhets 6fd293125e Merge branch 'ldap_connection_reuse' into 'master' 
Ldap Connection Reuse
 2014-03-18 08:06:21 +00:00
Dmitriy Zaporozhets 8fa53ce43d Merge branch 'check_orphaned_users_groups' into 'master' 
Check Orphaned Users Groups
 2014-03-18 07:14:08 +00:00
Marin Jankovski 11f20576e9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-17 16:34:34 +01:00
Marin Jankovski 1c6e93edf9 Add change to changelog. 2014-03-17 16:33:29 +01:00
Sytse Sijbrandij b36441f4d6 Merge pull request #6529 from MrKeiKun/system-hook-fix 
Fixed some minor typos
 2014-03-17 16:11:06 +01:00
Dmitriy Zaporozhets 493c7a6147 Merge branch 'links_within_same_repo' into 'master' 
Relative links within one system

When using relative links in md in repository file it will only link within the repository.
When using relative links in md in wiki page, it will only link to wiki pages.
 2014-03-17 14:06:08 +00:00
Dmitriy Zaporozhets 66c4a7dba1 Merge branch 'mysql-to-og' into 'master' 
MySQL to Postgres script
 2014-03-17 13:57:52 +00:00
dosire 70994c348d Postgresql conversion script. 2014-03-17 14:55:56 +01:00
Dmitriy Zaporozhets de855e2420 Default value for Snippet#private 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:50:16 +02:00
Dmitriy Zaporozhets cb43d88ada Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-17 15:47:58 +02:00
Dmitriy Zaporozhets d5796975e7 Merge pull request #6544 from cirosantilli/show-link-to-public-projects-for-new-users 
Show link to public projects for new users.
 2014-03-17 15:43:30 +02:00
Jacob Vosmaer 5e7e814e81 Drop UsersGroup orphans using rails runner 2014-03-17 14:42:20 +01:00
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
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