Commit Graph
1992 Commits
Author SHA1 Message Date
Valery Sizov 9de15c1e0f GHE importer: single configuration for auth and importer 2015-02-10 15:18:28 +02: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
Valery Sizov 411bf8ca08 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-05 18:06:00 -08:00
Valery Sizov 33349dd549 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08: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
Dmitriy Zaporozhets fc13ea7137 Merge pull request #8712 from jvanbaarsen/add-merge-request-files-endpoint
Added a way to retrieve MR files
2015-02-04 14:46:54 -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 7aa3f6053e Consolidate the SSH topics into a single file, since the two
available topics are quite short.

Also correct some missing words, punctuation.
2015-02-04 08:23:24 -08:00
Jeroen van Baarsen b60d06eb2c Added a way to retrieve MR files
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-04 10:24:25 +01:00
Marin Jankovski 56a456b43d Merge branch 'doc_cookbook_uses_omnibus' into 'master'
Drop comments on cookbook installing from source now that it uses Omnibus.

gitlab-coockbook now uses Omnibus packages so raketasks are invoked via gitlab-rake

See merge request !318
2015-02-04 05:28:10 +00:00
Dmitriy Zaporozhets f1ffed2637 Merge branch 'add_more_maintenance_tasks' into 'master'
Add more maintenance tasks to documentation

See merge request !317
2015-02-04 04:34:07 +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
Dmitriy Zaporozhets 9e5f4aec6c Merge branch 'new-file-repo-docs' into 'master'
Web editor documentation

Related to #1930

See merge request !1458
2015-02-03 19:17:04 +00:00
Job van der Voort 68fbf1423f improve english documentation 2015-02-03 11:05:20 -08:00
jubianchi 4e97f26649 Acces groups with their path in API 2015-02-03 13:42:38 +01: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
Dmitriy Zaporozhets 7ba97ab4a5 Web editor documnetation 2015-02-02 16:43:51 -08:00
Job van der Voort 6496dc3cd4 Merge branch 'doc/import' into 'master'
Make omnibus the default in repo import docs

I hope this reads nicer for people using omnibus packages.

See merge request !1420
2015-02-03 00:22:53 +00:00
Marin Jankovski 45349abdb2 Correct the CentOS 6 package link 2015-02-02 11:21:26 -08:00
Job van der Voort 561a715308 add clear documentation on searching between groups 2015-02-02 10:00:05 -08:00
Jacob Vosmaer 1015dfbe4d Fix Ubuntu 14.04 download link for 7.7.2-ee 2015-02-02 10:17:40 +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
Marin Jankovski 99e0d954d0 Packages for 7.2.2-ee and 5.4.2 CI. 2015-01-29 23:32:47 -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
Job van der Voort 5914c7e1b7 Merge branch 'ldap_defaults' into 'master'
Saner LDAP defaults

I have the impression that most people use LDAP servers listening
on port 389, without encryption. If we make that the default we
give people a smoother ride setting up GitLab.

See merge request !1446
2015-01-28 18:24:30 +00:00
Jacob Vosmaer 087c4cbc3c Make 'plain', port 389 the default for LDAP 2015-01-28 11:34:33 +01:00
Jacob Vosmaer 43da3f0929 Point out common LDAP port/method combinations 2015-01-28 11:34:33 +01:00
Achilleas Pipinellis e0e6574ff7 Add assets precompile and redis clear cache to maintenance tasks. 2015-01-28 09:07:27 +02:00
Achilleas Pipinellis bf44938cc0 Drop comments on cookbook installing from source now that it uses Omnibus. 2015-01-28 08:50:31 +02:00
Boyan Tabakov 93bc2d5202 Added support for firing system hooks on group create/destroy and adding/removing users to group.
Added tests and updated docs. Also adding 'user_id' field in the hooks for adding/removing user from team.
2015-01-27 09:25:28 +02:00
Jacob Vosmaer addb255584 Separate out the instructions for source installs 2015-01-26 17:03:04 +01:00
Dmitriy Zaporozhets 3af2ac9df0 Merge branch 'wip-documentation' into 'master'
Add return value example to ssh key creation

See merge request !307
2015-01-25 04:38:39 +00:00
Dmitriy Zaporozhets bdc78c96db Merge branch 'ssh_doc' into 'master'
Documentation on how to copy your ssh key to clipboard with the console

This MR just adds some documentation in case people want to use the bash to copy their public ssh key to the clipboard.

See merge request !311
2015-01-24 03:26:16 +00:00
Sytse Sijbrandij 061ac79236 Rename workflow to feature branch flow and add better desciption of workflow category. 2015-01-23 11:18:10 -08:00
Marin Jankovski 749137173e Packages for 7.7.1. 2015-01-22 23:43:15 -08:00
Dmitriy Zaporozhets 572fa075bd Merge branch 'kerberos_doc' into 'master'
Kerberos documentation improvement

See merge request !297
2015-01-22 23:18:29 +00:00
Dmitriy Zaporozhets e49b636497 Merge branch 'feature_api_project_edit' into 'master'
API: Implement edit via API for projects

I've picked up https://github.com/gitlabhq/gitlabhq/pull/8055 fixed the few hound warnings and replaced all double quotes in the spec file where possible.

# From the original PR:

Implements edit via API for projects. Edit was part of missing features in feature request Full CRUD operations via API for projects.
http://feedback.gitlab.com/forums/176466-general/suggestions/3904506-full-crud-operations-via-api-for-projects

Feature is implemented using existing UpdateService for projects. Permission to change visibility level and name are checked in addition to check for permission to administer project.

Doesn't allow updating project namespace id, because there was existing API-method for transferring project to a group.

Documentation added to doc/api/projects.md. Uses API request PUT /projects/:id .

Tests included for:
1. Success for changing path
2. Success for changing name
3. Success for changing visibility level
4. Success for changing all other attributes
5. Success for changing name & path to existing name & path but in different namespace
6. Failure if not authenticated
7. Failure if path exists in project's namespace
8. Failure if name exists in project's namespace
9. Failure if not sufficient permission to change name
10. Failure if not sufficient permission to change visibility level
11. Failure if not sufficient permission to change other attributes

Allows updating following parameters:

* name
* path
* visibility_level
* public
* default_branch
* issues_enabled
* wiki_enabled
* snippets_enabled
* merge_requests_enabled
* description

See merge request !310
2015-01-22 23:02:50 +00:00
Hannes Rosenögger abbb29b30c Update ssh doc with commands to copy the public key to the clipboard 2015-01-22 20:27:11 +01:00
Dmitriy Zaporozhets 02c5077fde Merge branch 'feature_api_milestone_issues' into 'master'
API: List issues for a particular milestone

# What does this MR do?
This MR adds a new API method for retrieving the issues associated with a particular milestone. The resource is described at ":id/milestones/:milestone_id/issues", returning a simple array of issues.

I've picked up gitlab-org/gitlab-ce!113  and fixed the test for it.
From the original MR:
This feature was motivated by an in-house project for reporting--for large projects, retrieving and filtering the entire issue list by milestone was becoming too slow, particularly when pagination required multiple requests. While this resource also uses pagination, it allows the consumer to limit reporting to the particular milestone they are interested in.

@dblessing Please take a look :)

See merge request !308
2015-01-22 18:31:18 +00:00
Mika MäenpääandHannes Rosenögger 7dd5656a5b Implement edit via API for projects 2015-01-22 16:58:01 +01: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
Hannes Rosenögger e03f1af00a Fix the test and add documentation for the "per-milestone issues API call" 2015-01-22 12:14:53 +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
Marin Jankovski 28af1190e3 Packages for 7.7.0-ee. 2015-01-21 13:50:14 -08:00
Loic Dachary d9b946fb3e Document ssh key creation error
Add the error code returned in the headers as well as an example of the
JSON informative message returned in the body.

Signed-off-by: Loic Dachary <loic@dachary.org>
2015-01-21 19:08:15 +01:00
Loic Dachary 201b2f1099 Add return value example to ssh key creation
Signed-off-by: Loic Dachary <loic@dachary.org>
2015-01-21 18:57:54 +01:00