home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,755 Commits 48 Branches 340 Tags
b583bb5fcbb0ea609c0895f95ebdb45bb4f2eea0
Commit Graph
211 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 0fd7d3ebe0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:01:53 +02:00
Dmitriy Zaporozhets 46a84d8013 Merge branch 'rs-issue-2135' into 'master' 
Update docs for Ruby MRI 2.1 requirement

Addresses #2135 

See merge request !1089
 2015-08-05 09:21:03 +00:00
Jeroen van Baarsen 9076b5026b Update the Semaphore badge to the shield badge type 
**Why is this needed?**
It just does look better in the Readme :-)

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-08-05 08:07:35 +02:00
Robert Speicher f9d71c4b91 Update docs for Ruby MRI 2.1 requirement 2015-08-04 17:07:12 -04:00
Douwe Maan f032b15dcf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	README.md
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	doc/workflow/README.md
#	lib/gitlab/satellite/merge_action.rb
 2015-07-23 13:40:31 +02:00
Sytse Sijbrandij 95400db9c8 Clean up editions paragraph 2015-07-17 09:56:34 +00:00
Sytse Sijbrandij 5d168588c0 Update installation instructions. 2015-07-17 09:52:41 +00:00
Sytse Sijbrandij 2590b16cb4 Improve the layout of the readme. 2015-07-17 09:50:37 +00:00
Dmitriy Zaporozhets c8758357b1 Document should start from h1 title. Also put badges on top for easier tracking 2015-07-16 12:13:09 +00:00
Sytse Sijbrandij b3ab0e4efb Revert "Change default admin password from "5iveL!fe" to "password"" 
This reverts commit 8a01a12228.
 2015-07-14 17:59:36 +02:00
Dmitriy Zaporozhets c84b14d2a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature
 2015-07-14 15:40:46 +02:00
Dmitriy Zaporozhets 7b06c32e00 Point to ci.gitlab.com badge in README 2015-07-09 22:28:12 +00:00
Sytse Sijbrandij 411d5287ed Link to update page. 2015-07-08 20:30:35 +00:00
Dmitriy Zaporozhets dd32818441 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/assets/javascripts/project_new.js.coffee
	app/helpers/appearances_helper.rb
	app/helpers/application_helper.rb
	app/helpers/groups_helper.rb
	app/helpers/oauth_helper.rb
	app/models/user.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/layouts/nav/_group.html.haml
	app/views/layouts/nav/_project_settings.html.haml
	app/views/profiles/accounts/show.html.haml
	doc/integration/README.md
	features/steps/project/merge_requests.rb
	features/support/env.rb
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/oauth_helper_spec.rb
	spec/lib/gitlab/ldap/access_spec.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/project_team_spec.rb
	spec/routing/admin_routing_spec.rb
	spec/services/git_push_service_spec.rb
	spec/services/test_hook_service_spec.rb
 2015-07-02 17:07:02 +02:00
Robert Speicher 8a01a12228 Change default admin password from "5iveL!fe" to "password" 2015-06-24 18:42:34 -04:00
Stan Hu 5a5c5b2db0 Revert avatar URL to original version 2015-06-23 10:26:38 -07:00
Stan Hu fe94254571 Fix avatar tests to use banana_sample.gif since SVG is not supported 2015-06-22 12:04:07 -07:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Sytse Sijbrandij fab298d685 Fix download location 2015-05-22 21:36:00 +00:00
Sytse Sijbrandij b1e860a63a EE can be accessed without a subscription 2015-05-22 19:03:23 +00:00
Sytse Sijbrandij 44506f06b0 Link to new locations. 2015-05-22 19:01:12 +00:00
Job van der Voort bb4761d826 update download info 2015-05-20 13:05:07 +02:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Dmitriy Zaporozhets 48a398328f Replace outdated gif in README with link to website 2015-05-06 15:11:55 +00:00
Dmitriy Zaporozhets 2e243fc321 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	README.md
	VERSION
	app/controllers/projects/services_controller.rb
	app/controllers/projects/uploads_controller.rb
	app/services/test_hook_service.rb
	db/schema.rb
	features/steps/admin/settings.rb
	lib/gitlab/reference_extractor.rb
	spec/models/note_spec.rb
 2015-04-27 11:53:31 +03:00
Sytse Sijbrandij f4872fc71b Make source code on GitLab more prominent. 2015-03-25 17:55:26 -07:00
Dmitriy Zaporozhets be4d340381 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb
 2015-03-11 18:41:41 -07:00
Dmitriy Zaporozhets f24e46b8f0 Remove pull-review badge since we dont use it 2015-03-03 21:59:43 -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
Wolfram Twelker 04b09bdd67 Revise main README for cleanup and some minor clarifications 
* Fix typos, add links, add minor text changes
* Rephrase three section for clarity

[ci skip]
 2015-02-08 00:16:29 +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
Dmitriy Zaporozhets 5ade3a6b78 We dont support ruby 2.2 yet 2015-01-20 11:59:35 -08:00
Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb
 2015-01-13 18:22:38 -08:00
Sytse Sijbrandij 6cce2be7eb Get rid of here links and simplify text. 2015-01-13 10:20:04 -08:00
Marc Radulescu 1cdce0f182 revise wording to clarify CE and EE definitions 2015-01-13 15:47:35 +01:00
Marc Radulescu ce6b0519cc remove duplication by linking EE features directly to website 2015-01-12 16:47:39 +01:00
Marc Radulescu 5b51ef7bdd add EE features list and useful links to readme file in gitlab 2014-12-26 18:14:23 +01: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
Sytse Sijbrandij 3f129fd618 Include default credentials in the readme and make all headers the same. 2014-12-17 11:07:10 +01:00
Sytse Sijbrandij 98e64610b2 Move development information to the GitLab Development Kit. 2014-12-17 08:27:03 +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
Sytse Sijbrandij 3a3471cc2e Update favorites to the new link. 2014-12-05 13:40:11 +01:00
Sytse Sijbrandij b8f0404b38 Upgrade link is redundant now that we have onboarding information. 2014-11-27 13:20:29 +01:00
Marc Radulescu 6ca01fe2b3 clarify standard subscriber doc as source for emergency info 2014-11-27 12:51:17 +01:00
Marc Radulescu 080be2ad04 moved location of subscriber info for clarity 2014-11-26 18:19:41 +01:00
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02:00
Job van der Voort 6704792933 link third applications to website 2014-10-23 11:11:53 +02:00
Valery Sizov 6c4c9a8c4c Add doc for upgrading CE to EE 2014-10-21 17:25:15 +03:00
Valery Sizov 7af04fe1b2 ce-upstream 2014-10-16 15:21:28 +03:00