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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Issue #595: Support Slack notifications upon issue and merge request events	Stan Hu	2015-03-03	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|	1) Adds a DB migration for all services to toggle on push, issue, and merge events. 2) Upon an issue or merge request event, fire service hooks. 3) Slack service supports custom messages for each of these events. Other services not supported at the moment. 4) Label merge request hooks with their corresponding actions.
*	Add brakeman rake task and improve code security	Dmitriy Zaporozhets	2015-03-02	4	-14/+39
\|
*	Merge branch 'less-sql-queries' into 'master'	Dmitriy Zaporozhets	2015-03-02	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce amount of sql queries on dashboard projects page For https://github.com/gitlabhq/gitlabhq/issues/7218 See merge request !1613
\| *	Reduce amount of sql queries on dashboard projects page	Dmitriy Zaporozhets	2015-03-02	1	-1/+1
\| \|
* \|	Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into ↵	Dmitriy Zaporozhets	2015-03-02	1	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Aorimn-add-irker-service Conflicts: app/controllers/projects/services_controller.rb
\| * \|	Add Irker service	Aorimn	2015-03-01	1	-1/+2
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/
* \|	Allow a user to specify a channel and username for the slack-webhook	Andrès Koetsier	2015-02-28	1	-1/+1
\|/
*	Merge branch 'update_update_project_milestone_path' into 'master'	Dmitriy Zaporozhets	2015-02-27	1	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \|	Update project_milestone_path update route. See merge request !1605
\| *	Update project_milestone_path update route.	Marin Jankovski	2015-02-26	1	-1/+2
\| \|
* \|	Fix syntax issue	Dmitriy Zaporozhets	2015-02-26	1	-1/+1
\| \|
* \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into route-helper	Dmitriy Zaporozhets	2015-02-26	2	-2/+2
\|\ \ \| \|/
\| *	Merge branch 'fix_gitlab_importer' into 'master'	Dmitriy Zaporozhets	2015-02-26	2	-2/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix GitLab && Gitorious importers. Hide already imported projects Fixes #2060 See merge request !1594
\| \| *	Fix Gitorious import status page hiding of already added projects.	Douwe Maan	2015-02-25	1	-1/+1
\| \| \|
\| \| *	Fix GitLab importer. Hide already imported projects	Valery Sizov	2015-02-25	1	-1/+1
\| \| \|
* \| \|	Include route helper shortcut in controller	Dmitriy Zaporozhets	2015-02-26	1	-0/+1
\| \| \|
* \| \|	More use of shortcut routes	Dmitriy Zaporozhets	2015-02-25	2	-8/+4
\| \| \|
* \| \|	Introduce shortcuts for routing helpers	Dmitriy Zaporozhets	2015-02-25	3	-6/+6
\|/ /
* \|	Merge branch 'extend_markdown_upload' into 'master'	Dmitriy Zaporozhets	2015-02-25	4	-61/+35
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \	Merge branch 'master' into extend_markdown_upload	Douwe Maan	2015-02-25	3	-5/+27
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/files_controller.rb
\| * \|	Merge branch 'master' into extend_markdown_upload	Douwe Maan	2015-02-24	26	-69/+148
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# 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	14	-13/+55
\| \|\ \ \
\| * \| \| \|	Fix URL to uploaded file.	Douwe Maan	2015-02-20	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'extend_markdown_upload' into generic-uploads	Douwe Maan	2015-02-20	4	-57/+33
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/files_controller.rb # app/controllers/projects/uploads_controller.rb # app/uploaders/attachment_uploader.rb
\| \| * \| \| \|	Refactor.	Douwe Maan	2015-02-17	3	-31/+40
\| \| \| \| \| \|
\| \| * \| \| \|	implement Project::UploadsController	Hannes Rosenögger	2015-02-17	2	-27/+18
\| \| \| \| \| \|
\| \| * \| \| \|	Generalize the image upload in markdown	Hannes Rosenögger	2015-02-17	2	-13/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit generalizes the image upload via drag and drop so it supports all files. It also adds access control for these files.
\| * \| \| \| \|	Satisfy Rubocop.	Douwe Maan	2015-02-20	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'bitbucket-import'	Dmitriy Zaporozhets	2015-02-25	4	-0/+102
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/views/import/gitorious/status.html.haml db/schema.rb
\| * \| \| \| \|	Re-enable rescuing from Bitbucket OAuth errors.	Douwe Maan	2015-02-24	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Load public key in initializer.	Douwe Maan	2015-02-24	4	-0/+28
\| \| \| \| \| \|
\| * \| \| \| \|	Add Bitbucket importer.	Douwe Maan	2015-02-24	1	-0/+74
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'fix-404-admin-delete' into 'master'	Dmitriy Zaporozhets	2015-02-24	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 404 when deleting a project from the admin section This is some additional fallout from the rails upgrade. Need to use plural namespaces in the path function to get project deletion to go back to the project listing. See merge request !351
\| * \| \| \| \|	Fix 404 when deleting a project	DJ Mountney	2015-02-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The deletion from the admin section was redirecting to the wrong address.
* \| \| \| \| \|	Merge branch 'contributed-projects' into 'master'	Dmitriy Zaporozhets	2015-02-24	1	-1/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve contributed project and commit calendar selection. Fixes #2024. See merge request !1554
\| * \| \| \| \| \|	Exclude forks from profile contributions list.	Douwe Maan	2015-02-24	1	-1/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'web_editor_branch' into 'master'	Dmitriy Zaporozhets	2015-02-24	1	-3/+23
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Web Editor: save to new branch Implements #1931 See merge request !1523
\| * \| \| \| \| \| \|	Web Editor: save to new branch	Valery Sizov	2015-02-24	1	-3/+23
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Fix access to attachments uploaded with 'Choose file' button for public	Dmitriy Zaporozhets	2015-02-24	1	-0/+2
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	access
* \| \| \| \| \|	Allow non authenticated access to avatars	Dmitriy Zaporozhets	2015-02-23	1	-0/+9
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Fix updating issue 500 error	Dmitriy Zaporozhets	2015-02-22	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into rails-4.1.9	Vinnie Okada	2015-02-21	16	-13/+91
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'empty-project-redirect-vs-404' into 'master'	Dmitriy Zaporozhets	2015-02-21	13	-13/+12
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redirect from /tree/master on empty repo instead of showing 404. See https://gitlab.com/gitlab-org/gitlab-ce/issues/1114 See merge request !1559
\| \| * \| \| \|	Move 'require_non_empty_project' filter to front so 'assign_ref_vars' ↵	Douwe Maan	2015-02-20	13	-13/+12
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doesn't 404.
\| * \| \| \|	Merge branch 'upload-xss-access-control' into 'master'	Marin Jankovski	2015-02-20	2	-0/+36
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \|	Satisfy Rubocop.	Douwe Maan	2015-02-20	1	-1/+1
\| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Use controllers to serve uploads, with XSS prevention and access control.	Douwe Maan	2015-02-20	2	-0/+36
\| \| \|/ /
\| * \| \|	Add gitorious.org importer	Marcin Kulik	2015-02-20	1	-0/+43
\| \|/ /
* \| \|	Merge branch 'master' into rails-4.1.9	Vinnie Okada	2015-02-19	8	-28/+62
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	Revert "Fix broken access control and refactor avatar upload"	Dmitriy Zaporozhets	2015-02-19	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7d5f86f6cbd187e75a6ba164ad6bfd036977dd07.
\| * \|	Revert "Nitpicking."	Dmitriy Zaporozhets	2015-02-19	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit ebd39fc082b09177e0777e5de5729c3f98495e87.