home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
53 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -08:00
Ewan Edwards ad6c372eee Fix a number of discovered typos, capitalization of developer and 
product names, plus a couple of instances of bad Markdown markup.
 2015-02-03 15:18:40 -08:00
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08:00
Jacob Vosmaer a63187f28b Don't create zombies with IO.popen 
The previous recommend incantation would leave the process we read from
hanging around, even though it had finished. That gives you a
'defunct'/'zombie' process.
 2015-01-22 15:53:16 +01:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02:00
Jacob Vosmaer 82eb0a44d7 Add security tips about file and paths 2014-12-09 14:51:15 +01:00
Robert Schilling 369375d086 Move sidekiq debug docs to development folder 2014-12-07 01:24:03 +01:00
Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +02:00
Sytse Sijbrandij 3dc25ba331 Remove warning from db seed since it is called by db setup. 2014-12-04 21:22:21 +01:00
Sytse Sijbrandij 704b7237e6 Fix notifications for developers that don't read the documentation. 2014-12-04 16:54:08 +01:00
Jacob Vosmaer 6491974554 Disable Sidekiq arguments logging by default 2014-12-01 18:58:37 +01:00
Marc Radulescu c85d4af889 remove unnecessarry image 2014-11-27 10:24:19 +01:00
Marc Radulescu 8ccaee1979 replaced hotlink 2014-11-26 20:54:42 +01:00
Marc Radulescu b82a205b74 added office analogy to help understanding of gitlab architecture 2014-11-26 18:51:12 +01:00
Valery Sizov 7af04fe1b2 ce-upstream 2014-10-16 15:21:28 +03:00
Achilleas Pipinellis c2bcdeb950 Make semaphore configuration an ordered list. 2014-10-15 20:52:39 +03:00
Achilleas Pipinellis b57ec54fae Point to correct project on githost.io. 2014-10-15 20:25:47 +03:00
Marin Jankovski 57b38f6f1c Describe who can trigger builds and where, add no red tests policy to contributing doc. 2014-10-15 12:48:37 +02:00
Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-10-14 18:23:51 +03:00
Ciro Santilli 7dcbf35019 Replace www.gitlab.com with about.gitlab.com 2014-10-07 13:16:19 +02:00
Dmitriy Zaporozhets eafac5932f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/merge_requests_helper.rb
	doc/update/README.md
	lib/gitlab/reference_extractor.rb
 2014-10-03 16:18:40 +03:00
Jacob Vosmaer 97c5d38097 Add a counterexample to 'do it in Ruby' 2014-10-02 18:27:18 +02:00
Marin Jankovski 4ddabdd793 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-09-22 14:38:02 +02:00
Sytse Sijbrandij db2bb8c304 Add semaphore config to ci testing doc. 2014-09-19 13:23:53 +02:00
Dmitriy Zaporozhets c0cecdb08a Mention build script 2014-09-18 15:14:40 +00:00
Dmitriy Zaporozhets 175a913065 CI setup docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-18 16:45:18 +03:00
Sytse Sijbrandij 399055db77 End TTD discussion. 2014-08-25 11:53:09 +02:00
Marin Jankovski d9605ad3ea Add the documentation for ee feature steps. 2014-08-25 09:43:12 +02:00
Robert Schilling abdc442648 Fix spelling errors in doc, closes #7437 
Further changes
 2014-08-07 10:27:54 +02:00
Rob Taylor 38a692d20b Fixed typos in Development - Rake Tasks doc 2014-07-31 17:55:13 +01:00
Sytse Sijbrandij 6d0bfc922d Updated the picture based on comments. 2014-07-10 23:34:29 +02:00
Sytse Sijbrandij 2df7a7b204 Update the diagram and make clear that rails accesses the repo's via shell. 2014-07-10 18:54:25 +02:00
Ciro Santilli fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
Dmitriy Zaporozhets 7e10d10178 Add doc file for dev rake tasks 2014-04-24 19:53:18 +02:00
dosire 2a9eb02650 Also need to change the reference. 2014-04-08 12:38:24 +02:00
dosire 76ca5976de Remove nested images since they are not supported by https://gitlab.com/gitlab-com/doc-gitlab-com 2014-04-08 12:28:59 +02:00
Dmitriy Zaporozhets 0546a98981 Merge branch 'doc-readme-for-site' into 'master' 
Doc-readme-for-site

New readme files for doc.gitlab.com
I also but the links for the api readme at the top.
 2014-03-27 18:30:50 +00:00
Job van der Voort 3b3186d58b fix image not displaying in GitLab due to faulty markdown 2014-03-27 14:34:55 +00:00
dosire 417c0cb2d3 New doc site needs indexes. 2014-03-27 12:17:27 +01:00
Jacob Vosmaer 1fe07cfbae Merge branch 'attribution-for-shell-guide' into 'master' 
Attribution For Shell Guide
 2014-03-24 15:10:40 +00:00
dosire 842c0d6b5f Can deeplink after all. 2014-03-24 14:31:35 +01:00
dosire 00487d455a References for the issues the guide addresses. 2014-03-24 12:04:43 +01:00
Evgeniy Sokovikov 4f68e15d9e typo fix 2014-03-19 20:08:26 +03:00
dosire 509c45163a Update references to gitlab dot com. 2014-03-10 17:40:40 +01:00
Jacob Vosmaer 4c746c2522 Add shell commands guide 2014-02-25 11:53:01 +01:00
Jacob Vosmaer 464d820bc5 Domain sockets are the default, not TCP 2014-02-10 14:01:15 +01:00
Jacob Vosmaer e009e0203e Use one sentence per line in architecture.md 2014-02-10 13:59:30 +01:00
dosire c296ecfb59 Remove duplication with readme. Remove unneeded spaces. Prevent people writing ~git in the documentation. Descriptive headers. 2014-02-04 14:49:06 +01:00
Sam Gleske d030f62e4b adding ref from structure to architecture 2014-01-29 09:17:58 -05:00
Sam Gleske 3235d2c342 Clarifying web frontend direct file access 
Rewrite how Apache/nginx interacts with precompiled assets.
 2014-01-28 22:12:51 -05:00