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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Version 8.5.0-rc1v8.5.0-rc1	Rémy Coutable	2016-02-11	1	-1/+1
\|
*	Update CHANGELOG	Robert Speicher	2016-02-09	1	-0/+2
\| \| \| \|	[ci skip]
*	Merge branch 'freeze-constants-lib-gitlab-git' into 'master'	Robert Speicher	2016-02-09	1	-3/+3
\|\ \| \| \| \| \| \| \| \|	Freeze constants in Gitlab::Git See merge request !1730
\| *	Freeze the expression instead of the literal	Zeger-Jan van de Weg	2016-02-05	2	-11/+1
\| \| \| \| \| \| \| \|	Also remove the spec for it
\| *	Minor refactoring on Gitlab::Git	Zeger-Jan van de Weg	2016-02-05	2	-3/+13
\| \|
* \|	Merge branch 'smarter-diverging-commit-cache-flushing' into 'master'	Douwe Maan	2016-02-09	4	-16/+54
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Smarter flushing of branch statistics caches This basically ensures we only flush caches of branches whenever we really have to. See commit c514f8b850219cd3e5526e73e1d00e6729e2b466 for the details. cc @joshfng @rspeicher See merge request !2769
\| * \|	Smarter flushing of branch statistics caches	Yorick Peterse	2016-02-09	4	-16/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of flushing the behind/ahead counts for all branches upon every push we now only flush the cache of branches that actually need to have these statistics recalculated. There are now basically 2 scenarios and their effects: 1. A user pushes a commit to the default branch, this results in the cache being flushed for all branches. 2. A user pushes to a non default branch, this results in _only_ the cache for that branch being flushed. The existing code (Repository#expire_cache) remains backwards compatible with the previous behaviour, the new behaviour is only applied when a branch name is passed as an argument. This ensures that when for example a project is deleted the cache for all branches is flushed.
* \| \|	Merge remote-tracking branch 'github/master' into 'master'	Robert Speicher	2016-02-09	1	-1/+1
\|\ \ \
\| * \ \	Merge pull request #10023 from bozaro/smtp-port	Douwe Maan	2016-02-09	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Change default smpt port to 465 (default smtps port)
\| \| * \| \|	Change default smpt port to 465 (default smtps port)	Artem V. Navrotskiy	2016-02-09	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2016-02-09	37	-220/+404
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'ci-permissions' into 'master'	Robert Speicher	2016-02-08	37	-221/+405
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit guest access to builds Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646 See merge request !1942
\| \| * \| \| \|	Fix commit status tests	Kamil Trzcinski	2016-02-06	1	-18/+30
\| \| \| \| \| \|
\| \| * \| \| \|	Remove current_user && when can? is used	Kamil Trzcinski	2016-02-05	2	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into ci-permissions	Kamil Trzcinski	2016-02-05	80	-399/+958
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| \| * \| \| \| \|	Use `delete` instead of assignment operator when filtering build abilities	Kamil Trzcinski	2016-02-04	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update ability model after comments	Kamil Trzcinski	2016-02-04	1	-24/+15
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into ci-permissions	Kamil Trzcinski	2016-02-04	121	-478/+1243
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/builds/index.html.haml
\| \| * \| \| \| \| \|	Add behaviour tests for build permissions	Kamil Trzcinski	2016-02-04	4	-8/+56
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Rename allow_guest_to_access_builds to public_builds	Kamil Trzcinski	2016-02-04	12	-96/+202
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Expose allow_guest_to_access_builds in GitLab API	Kamil Trzcinski	2016-02-04	3	-5/+18
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Simplify abilities	Kamil Trzcinski	2016-02-04	1	-16/+23
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Properly handle commit status permissions (for a build)	Kamil Trzcinski	2016-02-03	2	-4/+26
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix build errors	Kamil Trzcinski	2016-02-03	2	-4/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Clean Ci::ApplicationController from unused permission related code	Kamil Trzcinski	2016-02-03	2	-50/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add CI setting: allow_guest_to_access_builds	Kamil Trzcinski	2016-02-02	6	-25/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
\| \| * \| \| \| \| \|	Make the CI permission model simpler	Kamil Trzcinski	2016-02-02	20	-71/+78
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions.
* \| \| \| \| \| \| \|	Merge branch 'index_snippet' into 'master'	Douwe Maan	2016-02-09	2	-1/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index for snippet's updated_at @DouweM We are ordering by `updated_at` but there is no index. cc @yorickpeterse See merge request !2768
\| * \| \| \| \| \| \| \|	Add index for snippet's updated_atindex_snippet	Valery Sizov	2016-02-09	2	-1/+7
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master'	Douwe Maan	2016-02-09	4	-11/+118
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose MergeRequest#merge_status _Originally opened at !2478 by @develop7._ - - - This enables API users to see whether a merge request can be merged without conflicts. See merge request !2756
\| * \| \| \| \| \| \| \|	Add an API spec for MergeRequest#merge_status and properly document this ↵develop7/add-merge_status-to-merge-request-in-api	Rémy Coutable	2016-02-08	3	-11/+117
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	resource
\| * \| \| \| \| \| \| \|	Expose MergeRequest::merge_status to API	Andrei Dziahel	2016-02-08	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/max-attachment-size-setting-validation'	Douwe Maan	2016-02-09	3	-0/+13
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add Changelog entry for new maximum attachment size validatorfix/max-attachment-size-setting-validation	Grzegorz Bizon	2016-02-09	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Validate maximum attachment size in application settings	Grzegorz Bizon	2016-02-09	2	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`max_attachment_size` in `ApplicationSetting` should be present, only integers greater than zero are valid. Closes #13188
* \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2016-02-09	10	-0/+65
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master' Add option to include the sender name in body of Notify email _Originally opened at !2495 by @huacnlee._ - - - Fixes #7824. See merge request !2767
\| * \| \| \| \| \| \| \| \|	Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail	Jason Lee	2016-02-09	10	-0/+65
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '3kami3/gitlab-ce-root_email' into 'master'	Douwe Maan	2016-02-09	3	-3/+6
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an option to supply root email through an environmental variable. _Originally opened at !2499 by @3kami3._ --- Add an option to supply root email through an environmental variable. See merge request !2751
\| * \| \| \| \| \| \| \| \|	Add an option to supply root email through an environmental variable.3kami3/gitlab-ce-root_email	3kami3	2016-02-08	3	-3/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project'	Douwe Maan	2016-02-09	3	-1/+16
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Validate uniqueness of milestone title per project	Zeger-Jan van de Weg	2016-02-08	3	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3903
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-tooltip-to-stuck-builds' into 'master'	Douwe Maan	2016-02-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a tooltip to the stuck warning build symbol We want to give people an idea of what is wrong with their build, we do this by adding a tooltip telling them where they can find more information about their broken builds. Fixes #10919 See merge request !2680
\| * \| \| \| \| \| \| \| \| \|	Add a tooltip to the stuck warning build symbol	Jeroen van Baarsen	2016-02-08	1	-1/+1
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to give people an idea of what is wrong with their build, we do this by adding a tooltip telling them where they can find more information about their broken builds. Fixes #10919 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/split-ci-jobs' into 'master'	Douwe Maan	2016-02-09	1	-4/+85
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	split gitlab-ci builds for ruby 2.1 Added breakdown of builds for Ruby 2.1 in .gitlab-ci.yml config file. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13252 See merge request !2746
\| * \| \| \| \| \| \| \| \| \|	split gitlab-ci builds for ruby 2.1	James Lopez	2016-02-08	1	-4/+85
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-broadcast-markdown' into 'master'	Douwe Maan	2016-02-09	12	-18/+87
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow limited Markdown in Broadcast Messages Closes #11853 See merge request !2695
\| * \| \| \| \| \| \| \| \| \|	Allow limited Markdown in Broadcast Messagesrs-broadcast-markdown	Robert Speicher	2016-02-06	12	-18/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #11853
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'increase_import_timeout' into 'master'	Douwe Maan	2016-02-09	3	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase project import timeout from 4 minutes to 15 minutes Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246 ## Import screenshot ![Screen_Shot_2016-02-04_at_1.45.20_PM](/uploads/d9d71ec953afae31e6fbe54a8932b945/Screen_Shot_2016-02-04_at_1.45.20_PM.png) See merge request !2717
\| * \| \| \| \| \| \| \| \| \| \|	Increase project import timeout from 4 minutes to 15 minutes	Drew Blessing	2016-02-04	3	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/atom-url-issue' into 'master'	Douwe Maan	2016-02-09	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do not rename .aToM but only .atom projects in migration Sorry @DouweM forgot to add this. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2651/diffs#bc35672f73f4ee025132aee428f383acdf0f755e_0_51 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2712