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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed typos in migration templatesmigration-helpers	Yorick Peterse	2016-05-19	2	-2/+2
\|
*	Remove left-over use of strip_heredoc	Yorick Peterse	2016-05-19	1	-1/+1
\|
*	Removed stray strip_heredoc from migration helpers	Yorick Peterse	2016-05-13	1	-1/+1
\|
*	Fixed styling per Rubocop pedantics	Yorick Peterse	2016-05-12	2	-5/+7
\|
*	Tell Rubocop to ignore lib/templates	Yorick Peterse	2016-05-12	1	-1/+2
\|
*	Link to migration guide in migration templates	Yorick Peterse	2016-05-12	2	-0/+6
\|
*	Updated migration styleguide for new helpers	Yorick Peterse	2016-05-12	1	-2/+44
\|
*	Added custom migration generator templates	Yorick Peterse	2016-05-12	2	-0/+84
\| \| \| \| \|	This allows us to automatically include Gitlab::Database::MigrationHelpers into newly generated migrations.
*	Added helper methods for database migrations	Yorick Peterse	2016-05-12	2	-0/+256
\| \| \| \| \| \| \| \|	These helpers can be used to perform migrations without taking down the entire application. For example, the method "add_column_with_default" can be used to add a new column with a default value without locking the entire table.
*	Merge branch 'fix-link-to-redmine-issues' into 'master'	Robert Speicher	2016-05-10	2	-0/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Allow Redmine issue references to work as intended Closes #14527 and #14894 See merge request !4048
\| *	Links for redmine issue references are generated correctly again	Benedikt Huss	2016-05-10	2	-0/+4
\| \|
* \|	Merge branch 'revert-450ea01d' into 'master'	Achilleas Pipinellis	2016-05-09	1	-5/+5
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Revert "Merge branch 'patch-1' into 'master'" This reverts merge request !4030. /cc @stanhu @axil @aral See merge request !4097
\| *	Revert "Merge branch 'patch-1' into 'master'"	Rémy Coutable	2016-05-09	1	-5/+5
\| \| \| \| \| \|	This reverts merge request !4030
* \|	Merge branch 'fix/todos-for-private-group-mentions' into 'master'	Douwe Maan	2016-05-09	3	-2/+22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix adding a todo for private group memebers See merge request !4081
\| * \|	Fix adding a todo for private group members	Ahmad Sherif	2016-05-07	3	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #14002
* \| \|	Merge branch 'cascade_drop' into 'master'	Robert Speicher	2016-05-09	1	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add if exists to drop command Add `IF EXISTS` as a precaution. Related to gitlab-org/gitlab-ce!4020 See merge request !4100
\| * \| \|	Add if exists to drop command	Drew Blessing	2016-05-09	1	-1/+3
\| \| \| \|
* \| \| \|	Merge branch 'issue_15394' into 'master'	Rémy Coutable	2016-05-09	6	-1/+26
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize milestones and labels titles fixes #15394 See merge request !4046
\| * \| \|	Make model sanitization methods one liners	Felipe Artur	2016-05-09	3	-6/+5
\| \| \| \|
\| * \| \|	Sanitize milestones and label titlesissue_15394	Felipe Artur	2016-05-05	5	-1/+27
\| \| \| \|
* \| \| \|	Merge branch '2954-api-expose-issue-user_notes_count' into 'master'	Rémy Coutable	2016-05-09	9	-34/+89
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Expose Issue#user_notes_count and MergeRequest#user_notes_count _Originally opened at !2954 by @cnam812._ - - - Expose `Issue#user_notes_count` and `MergeRequest#user_notes_count` through the API. See merge request !3126
\| * \| \| \|	Expose MergeRequest#user_notes_count in the API and use the method in issues ↵	Rémy Coutable	2016-05-09	7	-45/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	list Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	API: Expose Issue#user_notes_count	cnam-dep	2016-05-09	5	-6/+33
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-backport-ee-372' into 'master'	Rémy Coutable	2016-05-09	6	-48/+80
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes from gitlab-org/gitlab-ee!372 Mostly replaces several Spinach tests with RSpec Feature tests. See merge request !4043
\| * \| \| \| \|	Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372	Robert Speicher	2016-05-04	6	-48/+80
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Mostly replaces several Spinach tests with RSpec Feature tests.
* \| \| \| \|	Merge branch 'fix-secret' into 'master'	Rémy Coutable	2016-05-09	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't read otp_secret_encryption_key from hardcoded path in models/user Variable `Gitlab::Application.config.secret_key_base` is set in config/initializers/secret_token.rb. It's very bad practice to use hard-coded paths inside an application and really unnecessary in this case. Mirror of https://github.com/gitlabhq/gitlabhq/pull/10311 See merge request !4044
\| * \| \| \|	Don't read otp_secret_encryption_key from hardcoded path in models/user	Jakub Jirutka	2016-05-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Variable `Gitlab::Application.config.secret_key_base` is set in config/initializers/secret_token.rb. It's very bad practice to use hard-coded paths inside an application and really unnecessary in this case.
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-05-09	38	-81/+574
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'document-adding-instrumentation' into 'master'	Rémy Coutable	2016-05-09	1	-6/+123
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added documentation on how to instrument methods This will hopefully remove me as a single point of failure when it comes to adding instrumentation. cc @axil @rspeicher See merge request !4035
\| \| * \| \| \| \|	Added documentation on how to instrument methodsdocument-adding-instrumentation	Yorick Peterse	2016-05-05	1	-6/+123
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \|	Merge branch 'wiki-fix' into 'master'	Rémy Coutable	2016-05-09	5	-4/+7
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the proper GitLab URL for links in Wiki Fixes gitlab-org/gitlab-ce#17071 wiki links are proper compiled, e.g. ``` [same-level](same-level) -> <a href="same-level">same-level</a> [sub-level](sub/level) -> <a href="sub/level">sub-level</a> [upper-level](../upper-level) -> <a href="../upper-level">upper-level</a> ``` See merge request !4026
\| \| * \| \| \| \| \|	Use the proper GitLab URL for links in Wiki	Artem Sidorenko	2016-05-09	5	-4/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'rs-remove-wall_enabled' into 'master'	Dmitriy Zaporozhets	2016-05-09	6	-7/+6
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `wall_enabled` field from Project See merge request !4089
\| \| * \| \| \| \| \|	Remove `wall_enabled` field from Projectrs-remove-wall_enabled	Robert Speicher	2016-05-08	6	-7/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'improve-multiple-branch-push-performance' into 'master'	Yorick Peterse	2016-05-09	3	-2/+8
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve multiple branch push performance by memoizing permission checking See merge request !4091
\| \| * \| \| \| \| \| \|	Improve multiple branch push performance by memoizing permission checking	Stan Hu	2016-05-09	3	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you attempt to push thousands of branches at once, the 60-second timeout will occur because GitAccess checking does a lot of work to check if the user has permission to push to a branch. This changes does two things: 1. Instead of making 1 DB query per branch push, use a memoized list of protected branches to check 2. Memoize what permissions the user has to perform on this project On a test of 10,000 branch pushes, this prevents gitlab-shell from hitting the 60-second timeout. Closes #17225
\| * \| \| \| \| \| \| \|	Merge branch 'trusted-proxies-ip-addr' into 'master'	Rémy Coutable	2016-05-09	2	-1/+53
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass trusted_proxies to action_dispatch as IPAddrs instead of strings Without this setting your own trusted_proxies does not work. Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524 Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17004 See merge request !3970
\| \| * \| \| \| \| \| \|	Add tests for setting trusted_proxiestrusted-proxies-ip-addr	DJ Mountney	2016-05-04	1	-0/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Each test reloads the trusted_proxies initializer, which in turn will set Rails.application.config.action_dispatch.trusted_proxies to something new. This will leak into the other tests, but the middleware that it is used in has already been loaded for the whole test suite, so it should have no impact.
\| \| * \| \| \| \| \| \|	Pass trusted_proxies to action_dispatch as IPAddrs instead of strings	DJ Mountney	2016-04-28	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Without this setting your own trusted_proxies does not work.
\| * \| \| \| \| \| \| \|	Merge branch 'escape-commit-titles' into 'master'	Robert Speicher	2016-05-08	3	-1/+15
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Escape HTML in commit titles in system note messages Closes #17348 See merge request !4084
\| \| * \| \| \| \| \| \| \|	Escape HTML in commit titles in system note messages	Stan Hu	2016-05-07	3	-1/+15
\| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #17348
\| * \| \| \| \| \| \| \|	Merge branch 'fix-build-notification-on-merge-page-change' into 'master'	Stan Hu	2016-05-08	4	-10/+15
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix build notification on merge request page change even if the build status didn't change ## What does this MR do? This MR contains a bugfix for #17357 which was introduced by !3998. The notification are now only shown on status changes, and not when switching between different merge requests. ## Are there points in the code the reviewer needs to double check? Check implementation ## Why was this MR needed? Because auf a bug introduced in !3998. ## What are the relevant issue numbers? #17357 Closes #17357 See merge request !4086
\| \| * \| \| \| \| \| \| \|	Fix build notification on merge request page change even if the build status ↵	Benedikt Huss	2016-05-08	4	-10/+15
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	didn't change
\| * \| \| \| \| \| \| \|	Merge branch 'docs/adapt-user-api' into 'master'	Achilleas Pipinellis	2016-05-08	1	-22/+58
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs(api): adapted user API documentation to match with latest API The user API documentation and the actual implementation were out of sync, missing certain newly introduced fields and beeing inconsistent between certain API definitions. The documentation was changed according the actual latest implementation. Signed-off-by: Fabio Huser <fabio@fh1.ch> See merge request !4067
\| \| * \| \| \| \| \| \| \|	docs(api): adapted user API documentation to match with latest API	Fabio Huser	2016-05-06	1	-22/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The user API documentation and the actual implementation were out of sync, missing certain newly introduced fields and beeing inconsistent between certain API definitions. The documentation was changed according the actual latest implementation. Signed-off-by: Fabio Huser <fabio@fh1.ch>
\| * \| \| \| \| \| \| \| \|	Merge branch 'patch-3' into 'master'	Achilleas Pipinellis	2016-05-08	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	blost -> blog See merge request !4063
\| \| * \| \| \| \| \| \| \| \|	blost -> blog	Ben Bodenmiller	2016-05-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'update-doc-ci-examples' into 'master'	Achilleas Pipinellis	2016-05-08	3	-9/+9
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update CI example docs. Docs for CI examples are updated as follows: - Fix a dead link from CI example top to `dpl` - Specify Django for a Python project, not Rails - Use the latest Python Docker image as [Heroku supports only Python 3.5.1 (and 2.7.11)](https://devcenter.heroku.com/articles/python-support) - Show the latest Docker Hub URL links. See merge request !4082
\| \| * \| \| \| \| \| \| \| \| \|	Update CI example docs.	Takuya Noguchi	2016-05-07	3	-9/+9
\| \| \| \|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'update-docker-hub-link' into 'master'	Achilleas Pipinellis	2016-05-08	7	-17/+17
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Docker Hub and Engine links 1. Update all links to Docker Hub. 2. Update or rename Docker with Docker Engine. See merge request !4083