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
2176 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d0d82c0cfe Merge branch 'ce-to-ee' into 'master' 
CE to EE

See merge request !340
 2015-03-04 06:01:12 +00:00
Dmitriy Zaporozhets d997890270 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 2015-03-03 21:30:52 -08:00
Marin Jankovski 3d6d0e1e77 Merge branch 'fix-namespace-merge-request-url' into 'master' 
Fix namespace in merge request url building

Changes in 42387b733b now require namespace specification and broke abc69c8905.

There are additional helper functions in c530ca00b0, but this seemed easier not to rely on them.

See merge request !363
 2015-03-04 01:08:52 +00:00
Stan Hu 2088cee935 Fix URL builder to use GitlabRoutingHelper 2015-03-03 15:57:28 -08:00
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 8c47a72a4e Merge branch 'project-existence-leak' into 'master' 
Don't leak information about private project existence via Git-over-SSH/HTTP.

Fixes #2040 and https://gitlab.com/gitlab-org/gitlab-ce/issues/343.

Both `Grack::Auth` (used by Git-over-HTTP) and `Api::Internal /allowed` (used by gitlab-shell/Git-over-SSH) now return a generic "Not Found" error when the project exists but the user doesn't have access to it.

See merge request !1578
 2015-03-03 20:05:12 +00:00
Marin Jankovski a7fad44bd3 Merge branch 'go-import' into 'master' 
Render go-import meta tag for private repos.

The previously solution (626f5bab35) required a change to nginx config and broke visits from Googlebot and other clients including "go" in their user agent.

See merge request !1587
 2015-03-03 19:53:20 +00:00
Marin Jankovski e6a0fb1f77 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-03 11:50:21 -08:00
Douwe Maan 54b0c78745 Ignore case of LDAP user DN when checking group membership. 2015-03-03 17:35:19 +01:00
Jeroen van Baarsen abc69c8905 Merge branch 'fix-merge-request-url-builder' into 'master' 
Fix merge request URL passed to Webhooks

If you look at the data structure passed to Webhooks, you will see:

`"url"=>nil`

I don't think any of the Webhooks or services are using this yet, so right now nothing so far depends upon this value being correct.

See merge request !352
 2015-03-03 13:18:23 +00:00
Douwe Maan 3702c4ad80 Render go-import meta tag for private repos. 2015-03-03 11:22:30 +01:00
Douwe Maan 0e11be40c3 Add tests for GrackAuth. 2015-03-03 10:49:28 +01:00
Dmitriy Zaporozhets ee3714d5dc Merge branch 'ce-to-ee' into 'master' 
CE to EE

See merge request !333
 2015-03-03 07:13:56 +00:00
Dmitriy Zaporozhets f438791721 Fix import check for case sensetive namespaces 2015-03-02 23:06:59 -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
Dmitriy Zaporozhets 63148e7763 Merge branch 'ldap-ssh-key-prefix' into 'master' 
Ignore LDAP SSH key prefix and invalid keys.

See #214 and #230.

cc @job

See merge request !327
 2015-03-02 23:35:58 +00: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 e39bf83770 Merge pull request #8501 from AKoetsier/slack_channel_and_username 
Allow a user to specify a channel and username for the slack-webhook
 2015-03-02 15:17:56 -08:00
Stan Hu 4bc5c66fe1 Fix broken project_url routing when protected branches are accessed with an empty repo 2015-03-01 20:26:21 -08: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
Douwe Maan 99ffb0939c Add tests for LDAP person SSH keys. 2015-03-01 12:18:47 +01: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
Jeroen van Baarsen 66a82fd8da Merge pull request #8858 from Razer6/update-version-sorter 
Update version sorter to 2.0.0, fixes #8572
 2015-02-28 22:52:04 +01:00
Andrès Koetsier d2c85a68bb Allow a user to specify a channel and username for the slack-webhook 2015-02-28 10:06:32 +01:00
Douwe Maan 804a2488cf Fix and test User#contributed_projects_ids. 2015-02-27 10:49:47 +01:00
Robert Speicher e53dd7526f Allow mass-unassigning of issues 
Fixes #867

[ci skip]
 2015-02-25 23:57:23 -05:00
Robert Speicher 8490a8ab2a Rename bulk_update_context_spec to bulk_update_service_spec 2015-02-25 23:55:53 -05:00
Dmitriy Zaporozhets 0d884ff2b1 Merge branch 'extend_markdown_upload' into 'master' 
Generalizes image upload in drag and drop in markdown to all files

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.

- [x] Rebase on master when !1553 is merged in

See merge request !1530
 2015-02-25 23:36:03 +00:00
Robert Schilling 1c7947ace0 Add UTF-8 character to version_sorter test 2015-02-25 21:40:27 +01:00
Douwe Maan 4a8a2f8021 Ignore LDAP SSH key prefix and invalid keys. 2015-02-25 17:08:29 +01:00
Robert Schilling c6e9d14ceb Update version sorter to 2.0.0, fixes #8572 2015-02-24 23:20:00 +01:00
Douwe Maan 769d1ce64b Fix spec. 2015-02-24 16:10:55 +01:00
Douwe Maan f2b37de54b Fix specs. 2015-02-24 15:07:24 +01:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
 2015-02-24 14:54:39 +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
Stan Hu e363f2e675 Fix merge request URL passed to Webhooks. 
Previously the symbol "url" in the object_attributes hash would always be nil.
 2015-02-24 06:51:24 +00:00
Marin Jankovski b0dfe434c6 Using gitlab url to build links for gitlab issue tracker and add a spec. Fix rubocop warnings in path. 2015-02-23 18:43:26 -08:00
Vinnie Okada 5f232b5687 Improve error messages when file editing fails 
Give more specific errors in API responses and web UI flash messages
when a file update fails.
 2015-02-22 16:01:49 -07:00
Marin Jankovski e2b082c550 Add spec for jenkins and jira service name. 2015-02-21 17:41:55 -08:00
Vinnie Okada 2a9eed6620 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/projects/commits/_commit.html.haml
	app/views/projects/issues/_issue.html.haml
	app/views/projects/issues/_issue_context.html.haml
	app/views/projects/merge_requests/_merge_request.html.haml
	app/views/projects/merge_requests/show/_context.html.haml
 2015-02-21 12:55:28 -07:00
Douwe Maan aba1251594 Merge branch 'master' into extend_markdown_upload 2015-02-21 13:46:58 +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
Dmitriy Zaporozhets acc312fc25 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-20 13:54:21 -08: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
Marcin Kulik 157b4b4b1f Add gitorious.org importer 2015-02-20 17:42:58 +00:00
Douwe Maan 2570e4df79 Fix specs. 2015-02-20 16:55:38 +01:00
Douwe Maan 218283b368 Merge branch 'extend_markdown_upload' into generic-uploads 
# Conflicts:
#	app/controllers/files_controller.rb
#	app/controllers/projects/uploads_controller.rb
#	app/uploaders/attachment_uploader.rb
 2015-02-20 15:37:37 +01:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
 2015-02-19 20:53:05 -07:00