home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,779 Commits 48 Branches 340 Tags
bb57ee0260989be29213e8c514b56d4075ff0f0f
Commit Graph
2096 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 811505c7ce Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/views/groups/members.html.haml
 2015-03-03 13:33:40 -08:00
Dmitriy Zaporozhets 4697daf71a Merge branch 'installtion-from-source' into 'master' 
Clearly mark it as installation from source.

See merge request !1622
 2015-03-03 19:16:52 +00:00
Dmitriy Zaporozhets 6c78d94fc8 Merge branch 'help_page_markdown' into 'master' 
Add documentation about help txt page.

Related to #240

See merge request !332
 2015-03-03 19:16:21 +00:00
Sytse Sijbrandij 3ff7189738 Clearly mark it as installation from source. 2015-03-03 10:01:49 -08:00
Dmitriy Zaporozhets f850cff417 Update ci setup documenation 2015-03-02 18:34:29 -08: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
Marin Jankovski 5a17fae42a Add documentation about help txt page. 2015-03-02 16:01:18 -08:00
Dmitriy Zaporozhets f00feb14ec Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service 
Conflicts:
	app/controllers/projects/services_controller.rb
 2015-03-02 15:22:31 -08:00
Dmitriy Zaporozhets c0828d6fcd Merge branch '7-9-pre' into 'master' 
Recent changes from CE master

See merge request !325
 2015-03-02 22:56:40 +00:00
Dmitriy Zaporozhets ed3bd155fc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-02 13:45:46 -08:00
Dmitriy Zaporozhets 70e3409a50 Merge branch 'shell-paths' into 'master' 
More reasons why prefixing is good

Inspired by http://www.dwheeler.com/essays/filenames-in-shell.html

See merge request !1604
 2015-03-02 21:37:10 +00:00
Aorimn f84b7eef3f Add Irker service 
Irker is a gateway which sends IRC messages on git updates. This new
service provides an interface to this gateway, integrated in Gitlab, for
each updates.
As per the guidelines, this commit adds the new feature in the
CHANGELOG, tests and documentation.

See http://www.catb.org/esr/irker/
 2015-03-01 20:51:03 +01:00
Robert Schilling 4e5bc1d535 Merge branch 'master' into 'master' 
Error in docs for closing an issue

API docs for issues says you set parameter 'closed' to '1'.  I was not able to do that but I could set 'state_event' to 'close' which closed the issue.

Does not work
"https://gitlab.com/api/v3/projects/:id/issues/:issue_id?closed=1"

Does work
"https://gitlab.com/api/v3/projects/:id/issues/:issue_id?state_event=close"

See merge request !342
 2015-03-01 12:02:12 +00:00
Jeroen van Baarsen 93bacb03e5 Merge pull request #8890 from sue445/feature/project_api_avatar_url 
Expose avatar_url in projects API
 2015-03-01 10:54:42 +01:00
sue445 51abeaa1bc Expose avatar_url in projects API 
* Impl Project#avatar_url
* Refactor ApplicationHelper: Use Project#avatar_url
* Update changelog
 2015-03-01 10:13:01 +09: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
Robert Schilling e45811c12e Merge pull request #8803 from Bugagazavr/patch-2 
Correct json payload [ci skip]
 2015-02-28 23:05:27 +01:00
Sytse Sijbrandij 039fd3c562 Merge branch 'update_logs_document' into 'master' 
Mention audit events ee feature in logs documentation.

Related to gitlab/gitlabhq#1979

See merge request !1609
 2015-02-28 01:15:36 +00:00
Dmitriy Zaporozhets c85935c42a Merge branch 'mmonaco/gitlab-ce-api-user-noconfirm' into 'master' 
Add 'confirm' option to users api

For #1990

Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/129

See merge request !1610
 2015-02-27 22:59:44 +00:00
Dmitriy Zaporozhets 0d22b75b03 Merge branch 'master' into mmonaco/gitlab-ce-api-user-noconfirm 
Conflicts:
	lib/api/users.rb
 2015-02-27 13:01:57 -08:00
Marin Jankovski d6b05dac86 Link logs documentation in audit events document. 2015-02-27 12:48:14 -08:00
Marin Jankovski 238455aa97 Mention audit events ee feature in logs documentation. 2015-02-27 12:32:05 -08:00
Marin Jankovski 3e6b342a1a Remove CI sections related to release tool, update steps in monthly and patch release documentation. 2015-02-27 10:38:15 -08:00
Marin Jankovski 79a10b15e7 Add help_text to help text, login and static error pages. 2015-02-26 12:23:09 -08:00
Jacob Vosmaer 4efe3cf556 More reasons why prefixing is good 
Inspired by http://www.dwheeler.com/essays/filenames-in-shell.html
 2015-02-26 18:25:59 +01:00
Dmitriy Zaporozhets a52529f9b6 Merge branch 'bitbucket-import' 
Conflicts:
	app/views/import/gitorious/status.html.haml
	db/schema.rb
 2015-02-25 09:21:45 -08:00
Marin Jankovski e32e63ff1c Packages for 7.8.1-ee 2015-02-24 16:04:46 -08:00
Douwe Maan 56f51bed6b Expand Bitbucket integration docs. 2015-02-25 00:06:55 +01:00
Dmitriy Zaporozhets 46516411ef Merge branch 'web_editor_branch' into 'master' 
Web Editor: save to new branch

Implements #1931

See merge request !1523
 2015-02-24 19:38:45 +00:00
Valery Sizov 53e404144c changelog && documentation 2015-02-24 20:36:11 +02:00
Douwe Maan 20691df230 Add Bitbucket integration docs. 2015-02-24 15:07:25 +01:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +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
Marin Jankovski b727d8307e Add packages for 7.8.0-ee. 2015-02-21 22:02:18 -08: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
Marin Jankovski 5d72555ca0 Add a troubleshooting tips section to the git-annex doc. 2015-02-20 14:52:14 -08:00
Marin Jankovski 8ae3112b3f Merge branch 'upload-xss-access-control' into 'master' 
Fix note attachments XSS and access control

Replaces the reverted #1528, as proposed in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/434, as discussed with @dzaporozhets and as summarized in #2032.

@marin Could you take a look at the nginx config and apply it to Omnibus once this gets merged?

See merge request !1553
 2015-02-20 22:47:54 +00: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
Dmitriy Zaporozhets 92434b29cc Extend project web hooks with more data 
* add git_http_url and git_ssh_url to project web hook
* add visibility_level to project web hook
* add documentation about project visibility_level in API
 2015-02-20 10:27:37 -08:00
Derek Campbell 874640123b To close an issue you must set 'state_event' to 'close'. I cannot set 'closed' to '1'. 2015-02-20 09:20:42 -04:00
Dmitriy Zaporozhets 53a34b9c3c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	doc/integration/README.md
 2015-02-19 12:01:56 -08:00
Dmitriy Zaporozhets e480e45a8b Merge branch 'doc-omnibus-differences' into 'master' 
Document fun facts about omnibus-gitlab

I hope this helps developers understand some of the differences.

See merge request !1546
 2015-02-19 19:02:50 +00:00
Jeroen van Baarsen cbf6b6871e Merge pull request #8802 from Bugagazavr/patch-1 
Update API branches documentation [ci skip]
 2015-02-19 13:04:24 +01:00
Jacob Vosmaer 93e42f690b Document fun facts about omnibus-gitlab 2015-02-19 11:20:58 +01:00