delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix-namespace-merge-request-url' into 'master'	Marin Jankovski	2015-03-04	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix namespace in merge request url building Changes in 42387b733b76dfc1f72585015910a50f094e264f now require namespace specification and broke abc69c890513fb58c1ceae7548f4fbcc221b7c34. There are additional helper functions in c530ca00b0f40ec0e0df4d1885ce55e47a59b70d, but this seemed easier not to rely on them. See merge request !363
\| *	Fix URL builder to use GitlabRoutingHelper	Stan Hu	2015-03-03	1	-1/+1
\| \|
* \|	Merge branch 'project-existence-leak' into 'master'	Dmitriy Zaporozhets	2015-03-03	1	-0/+146
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Add tests for GrackAuth.	Douwe Maan	2015-03-03	1	-0/+146
\| \| \|
* \| \|	Merge branch 'go-import' into 'master'	Marin Jankovski	2015-03-03	1	-0/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render go-import meta tag for private repos. The previously solution (626f5bab3580926842aa6247e052008ddf1ca571) required a change to nginx config and broke visits from Googlebot and other clients including "go" in their user agent. See merge request !1587
\| * \| \|	Render go-import meta tag for private repos.	Douwe Maan	2015-03-03	1	-0/+16
\| \| \| \|
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2015-03-03	1	-0/+8
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'fix-merge-request-url-builder' into 'master'	Jeroen van Baarsen	2015-03-03	1	-0/+8
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \|	Fix merge request URL passed to Webhooks.	Stan Hu	2015-02-24	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the symbol "url" in the object_attributes hash would always be nil.
* \| \| \|	Fix import check for case sensetive namespaces	Dmitriy Zaporozhets	2015-03-02	1	-0/+10
\|/ / /
* \| \|	Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into ↵	Dmitriy Zaporozhets	2015-03-02	1	-0/+103
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Aorimn-add-irker-service Conflicts: app/controllers/projects/services_controller.rb
\| * \| \|	Add Irker service	Aorimn	2015-03-01	1	-0/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/
* \| \| \|	Merge pull request #8501 from AKoetsier/slack_channel_and_username	Dmitriy Zaporozhets	2015-03-02	1	-0/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Allow a user to specify a channel and username for the slack-webhook
\| * \| \| \|	Allow a user to specify a channel and username for the slack-webhook	Andrès Koetsier	2015-02-28	1	-0/+22
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Fix broken `project_url` routing when protected branches are accessed with ↵	Stan Hu	2015-03-01	1	-0/+10
\| \|/ / \|/\| \| \| \| \| \| \| \|	an empty repo
* \| \|	Merge pull request #8890 from sue445/feature/project_api_avatar_url	Jeroen van Baarsen	2015-03-01	2	-2/+35
\|\ \ \ \| \| \| \| \| \| \| \|	Expose avatar_url in projects API
\| * \| \|	Expose avatar_url in projects API	sue445	2015-03-01	2	-2/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Impl Project#avatar_url * Refactor ApplicationHelper: Use Project#avatar_url * Update changelog
* \| \| \|	Merge pull request #8858 from Razer6/update-version-sorter	Jeroen van Baarsen	2015-02-28	1	-2/+4
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Update version sorter to 2.0.0, fixes #8572
\| * \| \|	Add UTF-8 character to version_sorter test	Robert Schilling	2015-02-25	1	-4/+4
\| \| \| \|
\| * \| \|	Update version sorter to 2.0.0, fixes #8572	Robert Schilling	2015-02-24	1	-2/+4
\| \| \| \|
* \| \| \|	Fix and test User#contributed_projects_ids.	Douwe Maan	2015-02-27	1	-0/+28
\| \| \| \|
* \| \| \|	Allow mass-unassigning of issues	Robert Speicher	2015-02-25	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #867 [ci skip]
* \| \| \|	Rename bulk_update_context_spec to bulk_update_service_spec	Robert Speicher	2015-02-25	1	-0/+0
\| \|/ / \|/\| \|
* \| \|	Merge branch 'extend_markdown_upload' into 'master'	Dmitriy Zaporozhets	2015-02-25	4	-100/+132
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Fix spec.	Douwe Maan	2015-02-24	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' into extend_markdown_upload	Douwe Maan	2015-02-24	31	-257/+386
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# 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
\| * \| \|	Merge branch 'master' into extend_markdown_upload	Douwe Maan	2015-02-21	3	-0/+93
\| \|\ \ \
\| * \| \| \|	Fix specs.	Douwe Maan	2015-02-20	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'extend_markdown_upload' into generic-uploads	Douwe Maan	2015-02-20	4	-103/+128
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/files_controller.rb # app/controllers/projects/uploads_controller.rb # app/uploaders/attachment_uploader.rb
\| \| * \| \| \|	Refactor.	Douwe Maan	2015-02-17	3	-57/+57
\| \| \| \| \| \|
\| \| * \| \| \|	Fix tests	Hannes Rosenögger	2015-02-17	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	implement Project::UploadsController	Hannes Rosenögger	2015-02-17	1	-4/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Fix tests	Hannes Rosenögger	2015-02-17	1	-4/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Generalize the image upload in markdown	Hannes Rosenögger	2015-02-17	3	-77/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit generalizes the image upload via drag and drop so it supports all files. It also adds access control for these files.
* \| \| \| \| \|	Fix specs.	Douwe Maan	2015-02-24	3	-0/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Add Bitbucket importer.	Douwe Maan	2015-02-24	4	-7/+104
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Using gitlab url to build links for gitlab issue tracker and add a spec. Fix ↵	Marin Jankovski	2015-02-23	2	-3/+63
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	rubocop warnings in path.
* \| \| \|	Improve error messages when file editing fails	Vinnie Okada	2015-02-22	1	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Give more specific errors in API responses and web UI flash messages when a file update fails.
* \| \| \|	Merge branch 'master' into rails-4.1.9	Vinnie Okada	2015-02-21	3	-0/+93
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-02-20	2	-0/+90
\| \|\ \ \
\| \| * \| \|	Add gitorious.org importer	Marcin Kulik	2015-02-20	2	-0/+90
\| \| \|/ /
\| * \| \|	Extend project web hooks with more data	Dmitriy Zaporozhets	2015-02-20	1	-0/+3
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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
* \| \|	Merge branch 'master' into rails-4.1.9	Vinnie Okada	2015-02-19	5	-19/+38
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Improve broadcast message API	Dmitriy Zaporozhets	2015-02-18	1	-1/+2
\| \| \|
\| * \|	Merge branch 'fix-relative-anchored-links' into 'master'	Dmitriy Zaporozhets	2015-02-18	1	-1/+13
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Markdown relative links to files with anchors. Fixes #2016. cc @marin See merge request !1541
\| \| * \|	Fix Markdown relative links to files with anchors.	Douwe Maan	2015-02-18	1	-1/+13
\| \| \|/
\| * \|	Merge pull request #8774 from tsigo/rs-testenv	Dmitriy Zaporozhets	2015-02-17	1	-14/+20
\| \|\ \ \| \| \|/ \| \|/\|	TestEnv improvements
\| \| *	TestEnv improvements	Robert Speicher	2015-02-16	1	-14/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Simplify cleaning the temporary testing path in TestEnv - Don't run gitlab:shell:install if it's already installed - Run git commands quietly
\| * \|	Merge branch 'md-preview-class' into 'master'	Dmitriy Zaporozhets	2015-02-17	1	-1/+1
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure Markdown previews always use the same styling as the eventual destination. Font size, image width and code-block styling weren't accurate between the markdown preview and the issue/wiki/note body. See merge request !1514
\| \| *	Make sure Markdown previews always use the same styling as the eventual ↵	Douwe Maan	2015-02-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	destination.