home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 13:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,505 Commits 48 Branches 340 Tags
66d507a2e43fa446966214ea94be19da7db198f4
Commit Graph
443 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3840549566 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb
 2015-03-25 09:16:09 -07:00
Paul Beattie e15d154b1c Updated upgrader to highlight nodejs as required package [ci skip] 2015-03-22 22:41:21 +00:00
Dmitriy Zaporozhets a05cc636d7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/helpers/oauth_helper.rb
	db/schema.rb
 2015-03-21 20:41:10 -07:00
Vinnie Okada 5f86c08b2a Fix link in patch update guide 2015-03-21 11:29:24 -06:00
Marin Jankovski 3945ed65cf Merge remote-tracking branch 'ce/master' into ce_into_ee 
Conflicts:
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.9.md
 2015-03-17 15:00:13 -07:00
Marin Jankovski 9a0c99274e Update upgrade and installation docs for 7.9. 2015-03-17 14:07:05 -07:00
Dmitriy Zaporozhets d3361e6d1b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/application_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/team_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/helpers/projects_helper.rb
	app/helpers/tab_helper.rb
	app/models/application_setting.rb
	app/models/user.rb
	app/views/devise/shared/_signin_box.html.haml
	app/views/groups/projects.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/projects/team_members/_form.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
	db/schema.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2015-03-16 21:25:00 -07:00
Marin Jankovski b70e5c57c3 Add nodejs dependency to upgrader and upgrade from 7.7 docs 2015-03-16 13:47:21 -07:00
Dmitriy Zaporozhets 8dcffdcdc1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb
 2015-03-02 16:10:12 -08:00
Robert Schilling 8aabb58d5b Merge pull request #8757 from bbodenmiller/patch-1 
formatting cleanup on mysql_to_postgresql.md
 2015-02-28 23:14:08 +01:00
Robert Schilling 3678b64b4a Merge pull request #8758 from bbodenmiller/patch-3 
use gitlab branch of mysql-postgresql-converter
 2015-02-28 23:13:08 +01:00
Igor Bogoslavskyi 51b18fe6f6 typo fixed 
fixed a typo in an url to gitlab-ssl. Now it does not return the 404 error
 2015-02-24 10:50:18 +01:00
Dmitriy Zaporozhets 976e18bb33 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre 
Conflicts:
	app/views/groups/show.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
 2015-02-23 23:56:59 -08:00
Marin Jankovski 2feaa69cd5 Update version of gitlab-shell in the installation and update documentation. 2015-02-23 23:10:35 -08:00
Patrik Kernstock 2bf0a690bf Update 7.7-to-7.8.md 2015-02-22 21:39:13 +01:00
Robert Schilling 50305c363b Update gitlab-shell to 2.5.3 in 7-8 update guide, fixes #8838 2015-02-22 10:54:28 +01:00
Dmitriy Zaporozhets b2fb6e0e0c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/services/merge_requests/build_service.rb
	app/views/layouts/_head.html.haml
 2015-02-20 16:02:25 -08:00
Douwe Maan 08874d2b51 Make changes to nginx config less likely to break something. 2015-02-20 23:27:17 +01:00
Douwe Maan 0c4d27e82d Point out nginx config changes in update guides. 2015-02-20 22:36:19 +01:00
Marin Jankovski 7644bacc9e Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.8.md
 2015-02-16 20:30:21 -08:00
Marin Jankovski b6a678ef43 Use correct shell version in update doc. 2015-02-16 20:27:58 -08:00
Patricio Cano 1f63058c5e Updated guides for 7.8-ee 2015-02-16 18:08:40 -08:00
Patricio Cano d11c64a67f Updated the installation and update guides 2015-02-16 17:51:29 -08:00
Marin Jankovski 7d9ef1124e Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	README.md
	app/assets/javascripts/project.js.coffee
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/service.rb
	app/models/user.rb
	app/services/git_push_service.rb
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	doc/integration/github.md
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/merge_requests_helper.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/note_spec.rb
	spec/requests/api/groups_spec.rb
	spec/services/git_push_service_spec.rb
 2015-02-16 11:50:30 -08:00
Patricio Cano 2df8a91c82 Rephrased wording in the documentation to say "installation from source" instead of "manual installation" or similar. 2015-02-16 09:10:07 -08:00
Ben Bodenmiller 692bb679d0 use gitlab branch of mysql-postgresql-converter 2015-02-08 23:51:37 -08:00
Ben Bodenmiller a3a66939ca formatting cleanup on mysql_to_postgresql.md 2015-02-08 23:27:51 -08:00
Valery Sizov 45ec0d255d Merge remote-tracking branch 'ee/master' into ce_non_conflict 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
 2015-02-05 22:01:05 -08:00
Ben BodenmillerandJeroen van Baarsen f73cb6ff74 note about latest details being on master branch 
[ci skip]
 2015-02-05 20:41:18 +01:00
Jeroen van Baarsen eb39022674 Merge pull request #8318 from bbodenmiller/patch-9 
add editor command to update database.yml; cleanup
 2015-02-05 20:05:30 +01:00
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
Marin Jankovski d685d45222 Merge branch 'consolidate_ssh_docs' into 'master' 
Consolidate SSH docs

The two available SSH topics were quite short, so it made sense to combine them.

Includes fixes a few missing words, punctuation.

See merge request !328
 2015-02-04 17:11:38 +00: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
Sytse Sijbrandij 21b742a027 Merge branch 'master' into 'master' 
Fix capitalization of URL.

A targeted fix in the documentation.

See merge request !323
 2015-02-03 23:12:40 +00:00
Robert Schilling 0e896aa9e9 Update gitlab-shell to 2.4.2 for 7.7 install/update guide 
closes #8718, closes #8721
 2015-02-03 11:44:55 +01:00
Ewan Edwards e6e337088b Make all non-config/non-operational mentions of URL consistently 
capitalized.

Make the plural version consistently "URLs".

Fix an instance where the article "the" before URL was missing.
 2015-01-30 10:24:45 -08:00
Jacob Vosmaer 1a1d7085fa Mention libkrb5-dev dependency 2015-01-30 16:03:27 +01:00
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
Valery Sizov fe1e3db5a3 fix url in update doc 2015-01-19 14:18:31 -08:00
Valery Sizov b63e6e5abc fix url in update doc 2015-01-19 14:14:00 -08:00
Valery Sizov d5ae521cf7 update documentation regarding github_importer 2015-01-19 12:55:44 -08:00
Robert Schilling 5ee99290be Update gitlab-shell in docs to 2.4.1 2015-01-18 13:04:58 +01:00
Dmitriy Zaporozhets b620aa0b9b 7.7 CE to EE update guide 2015-01-14 17:55:26 -08:00
Dmitriy Zaporozhets 7cf49f8c4a Merge branch 'ce-master' 
Conflicts:
	doc/update/6.x-or-7.x-to-7.7.md
 2015-01-14 17:53:36 -08:00
Dmitriy Zaporozhets 973449b567 Update guides for CE 2015-01-14 17:40:35 -08:00
Dmitriy Zaporozhets a7dddd1bca Create update doc for 7.7 2015-01-14 17:34:39 -08:00
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
 2014-12-26 15:05:43 +02:00
Jeroen van Baarsen 334f240899 Merge pull request #8362 from bbodenmiller/patch-3 
add missing password prompt to mysqldump
 2014-12-23 16:41:20 +01:00
Sytse Sijbrandij e2c9a486d7 Note that it is default on Ubuntu. 2014-12-23 10:11:56 +01:00
Sytse Sijbrandij 9c7a7d4349 Add libkrb5-dev dependency. 2014-12-23 09:23:19 +01:00