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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Re-add EmailValidator to avoid the repetition of format: { with: ↵streamline-email-validation	Rémy Coutable	2016-02-09	5	-6/+10
\| \| \| \|	Devise.email_regexp }
*	Validate email addresses using Devise.email_regexp	Rémy Coutable	2016-02-09	11	-58/+90
\| \| \| \| \| \| \|	Also: - Get rid of legacy :strict_mode - Get rid of custom :email validator - Add some shared examples to spec emails validation
*	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
\| * \| \| \| \| \| \|	remove unnecessary lower function on SQL	James Lopez	2016-02-04	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	update changelog	Valery Sizov	2016-02-09	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'snippet_search_refactoring'	Valery Sizov	2016-02-09	4	-30/+31
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	trigger buildssnippet_search_refactoring	Valery Sizov	2016-02-05	0	-0/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	one more improvement to snippet search	Valery Sizov	2016-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Faster snippet search	Valery Sizov	2016-02-05	4	-29/+30
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'caching-repository-git-operations' into 'master'	Yorick Peterse	2016-02-09	6	-6/+140
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !2752
\| * \| \| \| \| \| \| \| \|	Cache various Repository Git operationscaching-repository-git-operations	Yorick Peterse	2016-02-08	6	-6/+140
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This caches the output of the following methods: * Repository#empty? * Repository#has_visible_content? * Repository#root_ref The cache for Repository#has_visible_content? is flushed whenever a commit is pushed to a new branch or an existing branch is removed. The cache for Repository#root_ref is only flushed whenever a user changes the default branch of a project. The cache for Repository#empty? is never explicitly flushed as there's no need for it.
* \| \| \| \| \| \| \| \|	Merge branch 'ci/improve-ci-build-api' into 'master'	Kamil Trzciński	2016-02-09	2	-93/+55
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve CI builds API specs This modifies a CI Runners Builds API, to improve performance, and add few missing examples. Extracted from !2560 (cherry-picked + extended). cc @ayufan See merge request !2698
\| * \| \| \| \| \| \| \| \|	Extract shared context level up in build specsci/improve-ci-build-api	Grzegorz Bizon	2016-02-04	1	-56/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also improve performance of specs by joining some of examples.
\| * \| \| \| \| \| \| \| \|	Remove unmaintainable db schema comment from build factory	Grzegorz Bizon	2016-02-04	1	-27/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Improve CI API specs related to operations on build	Grzegorz Bizon	2016-02-04	2	-21/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: spec/factories/ci/builds.rb
* \| \| \| \| \| \| \| \| \|	Merge branch 'backup-database-timeout-fix' into 'master'	Robert Speicher	2016-02-08	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix timeout issue for rake task gitlab:backup:create This is a fix for a database timeout which can occur when the backup create task is taking very long (1-2 hours). It seems that ActiveRecord is loosing the connection after a hour idleness and need to be reconnected before use. See merge request !2757
\| * \| \| \| \| \| \| \| \| \|	Make sure there is a connection before using ActiveRecordbackup-database-timeout-fix	Jeroen Nijhof	2016-02-08	1	-0/+3
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'huacnlee/current-settings-autoload-bug-in-development' into ↵	Robert Speicher	2016-02-08	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix CurrentSettings autoload bug in development _Originally opened at !2526 by @huacnlee._ - - - In development env, when we changed any file hit Rails reload, it will failed with this message: ``` A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active ``` See merge request !2753
\| * \| \| \| \| \| \| \| \| \|	Fix CurrentSettings autoload bug in development.huacnlee/current-settings-autoload-bug-in-development	Jason Lee	2016-02-08	1	-2/+2
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Error: A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Robert Schilling	2016-02-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammar in installation requirements. Fixes #13274 See merge request !2759
\| * \| \| \| \| \| \| \| \| \|	Fix grammar in installation requirements.	Paul Johnson	2016-02-08	1	-1/+1
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #13274
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-init' into 'master'	Rémy Coutable	2016-02-08	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed init.d script not working on OS X -s flag of su doesn't work correctly on OS X, logging in as the user and not running the requested command. By moving the bash shell init inside the su command we avoid the issue Fixes Issue #3309 See merge request !1728
\| * \| \| \| \| \| \| \| \| \|	Fixed init.d script not working on OS X	ritave	2016-02-08	2	-1/+2
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-s flag of su doesn't work correctly on some systems, loging in the user and not running the requested command. By moving the bash shell init inside the su command we avoid the issue
* \| \| \| \| \| \| \| \| \|	Merge branch 'issues_12693' into 'master'	Jacob Vosmaer	2016-02-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	suppress error in init-script while determining canonical path of gitlab_workhorse_dir fixes #12693 fixes #12954 See merge request !2697
\| * \| \| \| \| \| \| \| \|	suppress only errors in init-script while determining canonical path of ↵	Harald Spaethe	2016-02-08	1	-1/+1
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab_workhorse_dir
* \| \| \| \| \| \| \| \|	Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master'	Rémy Coutable	2016-02-08	5	-1/+37
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remember user's inline/tabular diff view preference in a cookie _Originally opened at !1677 by @kkm._ --- As per #3071, some users (we have a local EE installation) prefer 2-column view in diff. In this MR I add an implementation for this feature, using a cookie. Fixes #3071. See merge request !2723
\| * \| \| \| \| \| \| \|	Add spec for assigning view param from cookiekkm/gitlab-ce-user-diff-view-pref-cookie	Robert Speicher	2016-02-05	1	-5/+19
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update CHANGELOG	Robert Speicher	2016-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]