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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '33949-remove-healthcheck-access-token' into 'master'9-4-stable-prepare-RC1	Sean McGivern	2017-07-11	1	-6/+20
\| \| \| \| \| \| \|	Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612
*	Merge branch 'document-gitlab-shell-disable-gems' into 'master'	Stan Hu	2017-07-11	1	-0/+6
\| \| \| \| \|	doc:installation add note about disable-gems for gitlab-shell See merge request !12765
*	Merge branch 'jej/update-source-install-instructions-for-9-4' into 'master'	Achilleas Pipinellis	2017-07-11	1	-2/+2
\| \| \| \| \|	Update source installation instructions for 9.4 See merge request !12779
*	Merge branch 'jej/create-update-instructions-for-9-4' into 'master'	Achilleas Pipinellis	2017-07-11	1	-12/+33
\| \| \| \| \|	Update 9.4 update instructions to include changes made to 9.3 instructions See merge request !12781
*	Merge branch 'fix/gb/stage-id-reference-background-migration' into 'master'	Grzegorz Bizon	2017-07-08	1	-4/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add build stage_id reference background migration Closes #34151 See merge request !12513
\| *	Merge branch 'master' into 'fix/gb/stage-id-reference-background-migration'	Grzegorz Bizon	2017-07-07	11	-50/+137
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/concerns/each_batch.rb # spec/models/concerns/each_batch_spec.rb
\| * \	Merge remote-tracking branch 'origin/active-record-each-batch' into ↵	Grzegorz Bizon	2017-07-07	7	-5/+269
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/gb/stage-id-reference-background-migration * origin/active-record-each-batch: (59 commits) Added EachBatch for iterating tables in batches Extend MR tabs a bit to cover up the avatar holder and collapse icon on scroll Update VERSION to 9.4.0-pre. Add CHANGELOG Fix some N+1 queries in the GET /projects API Don't show auxiliary blob viewer for README when there is no wiki Improve & fix the performance bar UI and behavior Remove orphaned haml files Fixed CHANGELOG.md for 9.3.4 release Add table for merge request commits 34727 Remove two columned layout from project member settings Just draw :legacy_builds Re-enable polling for environments Cleanup minor UX issues in the performance dashboard Upgrade GitLab Workhorse to v2.3.0 Added test for the chart legend Use correct field for label name, fix default for unit to be blank Fix shorter route helpers in production environment Encode certificate-authority-data in base64 Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'" ...
\| \| * \|	Added EachBatch for iterating tables in batches	Yorick Peterse	2017-07-07	2	-0/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This module provides a class method called `each_batch` that can be used to iterate tables in batches in a more efficient way compared to Rails' `in_batches` method. This commit also includes a RuboCop cop to blacklist the use of `in_batches` in favour of this new method.
\| * \| \|	Improve code examples in background migrations docs	Grzegorz Bizon	2017-07-07	1	-4/+2
\| \| \| \|
\| * \| \|	Make it possible to schedule bg migrations in bulk	Grzegorz Bizon	2017-07-07	1	-4/+15
\| \| \| \|
* \| \| \|	Merge branch 'feature/user-datetime-search-api-mysql' into 'master'	Douwe Maan	2017-07-07	1	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add creation time filters to user search API for admins Closes #29507 See merge request !12682
\| * \| \| \|	add created at filter logic to users finder and API	James Lopez	2017-07-07	1	-0/+6
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'dm-mysql-log_bin_trust_function_creators' into 'master'	Sean McGivern	2017-07-07	2	-1/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention that 9.3 also needs `log_bin_trust_function_creators` on MySQL. See merge request !12687
\| * \| \| \|	Mention that 9.3 also needs `log_bin_trust_function_creators` on MySQL.dm-mysql-log_bin_trust_function_creators	Douwe Maan	2017-07-07	2	-1/+25
\| \|/ / /
* \| \| \|	Merge branch '20628-add-oauth-implicit-grant' into 'master'	Douwe Maan	2017-07-07	1	-45/+71
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#20628 Enable implicit flow in Gitlab as OAuth Provider Closes #20628, #2716, and #19470 See merge request !12384
\| * \| \| \|	#20628 Enable implicit flow in Gitlab as OAuth Provider	Mateusz Pytel	2017-07-07	1	-45/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #20628 by re-enabling implicit grant in Doorkeeper config. OAuth2 documentation refactored.
* \| \| \| \|	Merge branch '33929-allow-to-enable-perf-bar-for-a-group' into 'master'	Sean McGivern	2017-07-07	9	-4/+56
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to enable the performance bar per user or Feature group Closes #33929 and #34528 See merge request !12362
\| * \| \| \|	Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'	Sean McGivern	2017-07-07	5	-9/+16
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \ \ \ \	Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-group	Sean McGivern	2017-07-07	8	-46/+261
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Don't use Flipper for the Performance Bar	Rémy Coutable	2017-07-07	2	-30/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The implementation now simply rely on the `performance_bar_allowed_group_id` Application Setting. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Allow to enable the Performance Bar for a group from the admin area	Rémy Coutable	2017-07-06	2	-24/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Improve Features API and its docs and add a Changelog item	Rémy Coutable	2017-07-06	3	-7/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Document the Performance Bar	Rémy Coutable	2017-07-06	5	-0/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Document the feature groups	Rémy Coutable	2017-07-06	3	-3/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Address #34528 by improving the feature flags documentation	Rémy Coutable	2017-07-06	1	-1/+2
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'active-record-each-batch' into 'master'	Sean McGivern	2017-07-07	2	-0/+38
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added EachBatch for iterating tables in batches See merge request !12707
\| * \| \| \| \| \|	Added EachBatch for iterating tables in batchesactive-record-each-batch	Yorick Peterse	2017-07-07	2	-0/+38
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This module provides a class method called `each_batch` that can be used to iterate tables in batches in a more efficient way compared to Rails' `in_batches` method. This commit also includes a RuboCop cop to blacklist the use of `in_batches` in favour of this new method.
* \| \| \| \| \|	Merge branch 'feature/user-agent-details-api' into 'master'	Douwe Maan	2017-07-07	3	-0/+91
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow admins to retrieve user agent details for an issue or snippet Closes #29508 See merge request !12655
\| * \| \| \| \|	add spec and project snippet user agent details endpoint	James Lopez	2017-07-07	2	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	update docs	James Lopez	2017-07-07	2	-0/+36
\| \| \| \| \| \|
\| * \| \| \| \|	refactor code based on feedback	James Lopez	2017-07-06	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	fix docs	James Lopez	2017-07-06	2	-2/+6
\| \| \| \| \| \|
\| * \| \| \| \|	add API documentation	James Lopez	2017-07-06	2	-0/+49
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2017-07-07	4	-1/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'feature/intermediate/32568-adding-variables-to-pipelines-schedules' into 'master' Add variables to pipelines schedules Closes #32568 See merge request !12372
\| * \ \ \ \ \	Merge from master(Fix conflicts)	Shinya Maeda	2017-07-07	4	-41/+30
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	merge from master	Shinya Maeda	2017-07-07	7	-8/+302
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Revert unnecesary changes in doc/ci/variables/README.md	Shinya Maeda	2017-07-06	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix spec. Add PipelineScheduleVariable for import_export	Shinya Maeda	2017-07-05	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add docs for scheduled pipeline variables	Eric Eastwood	2017-07-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/32568
\| * \| \| \| \| \|	Fix spec. Add PipelineScheduleVariable for import_export	Shinya Maeda	2017-07-05	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add docs for scheduled pipeline variables	Eric Eastwood	2017-07-05	4	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/32568
* \| \| \| \| \| \|	Native group milestones	Felipe Artur	2017-07-07	1	-8/+5
\| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'	Kamil Trzciński	2017-07-07	1	-10/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Group secret variables Closes #12729 See merge request !12582
\| * \| \| \| \| \|	Copyedit docs for group-level secret variables	Achilleas Pipinellis	2017-07-07	1	-24/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \|	Basic BE change	Shinya Maeda	2017-07-07	1	-3/+18
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Basic BE change Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Implement CURD Rename codes related to VariableGroup and VariableProject FE part Remove unneccesary changes Make Fe code up-to-date Add protected flag to migration file Protected group variables essential package Update schema Improve doc Fix logic and spec for models Fix logic and spec for controllers Fix logic and spec for views(pre feature) Add feature spec Fixed bugs. placeholder. reveal button. doc. Add changelog Remove unnecessary comment godfat nice catches Improve secret_variables_for arctecture Fix spec Fix StaticAnlysys & path_regex spec Revert "Improve secret_variables_for arctecture" This reverts commit c3216ca212322ecf6ca534cb12ce75811a4e77f1. Use ayufan suggestion for secret_variables_for Use find instead of find_by Fix spec message for variable is invalid Fix spec remove variable.group_id = group.id godffat spec nitpicks Use include Gitlab::Routing.url_helpers for presenter spec
* \| \| \| \| \|	Merge branch 'gitaly-mandatory' into 'master'	Sean McGivern	2017-07-07	3	-31/+13
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove option to disable Gitaly in Rails See merge request !12677
\| * \| \| \| \|	Remove option to disable Gitaly completely	Jacob Vosmaer	2017-07-07	3	-31/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Configure token on client side too	Jacob Vosmaer	2017-07-06	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'helm-runner-doc-certs' into 'master'	Marin Jankovski	2017-07-06	1	-0/+53
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add GitLab Runner Helm Chart documenation for custom certificates See merge request !12594
\| * \| \| \| \|	Add GitLab Runner Helm Chart documenation for cucstom certificateshelm-runner-doc-certs	DJ Mountney	2017-06-30	1	-0/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This outlines how to provide the custom ssl certificate to the runner for accessing GitLab in the case that GitLab is using a custom/self-signed certificate.