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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use gitlab-shell 7.1.2gitlab-shell-7.1.2	Jacob Vosmaer	2018-04-09	1	-1/+1
\|
*	Merge branch 'blackst0ne-rails5-fix-frozen-array' into 'master'	Sean McGivern	2018-04-09	1	-2/+1
\|\ \| \| \| \| \| \| \| \|	[Rails5] Fix `can't modify frozen Array` errors See merge request gitlab-org/gitlab-ce!18239
\| *	Refactor `add_recipients`blackst0ne-rails5-fix-frozen-array	blackst0ne	2018-04-09	1	-3/+2
\| \|
\| *	[Rails5] Fix spec/requests/projects/cycle_analytics_events_spec.rb	blackst0ne	2018-04-07	2	-3/+3
\| \|
* \|	Merge branch '41981-allow-group-owner-to-enable-runners-from-subgroups' into ↵	Yorick Peterse	2018-04-09	3	-10/+21
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Group owner cannot enable/disable specific-runners which was registered in a project under a subgroup" Closes #41981 See merge request gitlab-org/gitlab-ce!18009
\| * \|	Remove unused User#manageable_group_projects (#41981)	Dylan Griffith	2018-04-09	1	-4/+0
\| \| \|
\| * \|	Use project_authorizations instead of members to calculate manageable CI ↵	Dylan Griffith	2018-04-09	1	-13/+1
\| \| \| \| \| \| \| \| \| \| \| \|	projects to speed up query (#41981)
\| * \|	Allow group owner to enable runners from subgroups (#41981)	Dylan Griffith	2018-04-09	3	-5/+32
\| \| \|
* \| \|	Merge branch 'move-board-blank-state-vue-component' into 'master'	Filipa Lacerda	2018-04-09	4	-36/+48
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move BoardBlankState vue component See merge request gitlab-org/gitlab-ce!17666
\| * \| \|	Move BoardBlankState vue component	George Tsiolis	2018-04-07	4	-36/+48
\| \| \| \|
* \| \| \|	Merge branch 'feature/#37403-clearer-email-handler' into 'master'	Sean McGivern	2018-04-09	3	-1/+43
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make email handler clearer Closes #37403 See merge request gitlab-org/gitlab-ce!17501
\| * \| \| \|	Make email handler clearer	Riccardo Padovani	2018-04-09	3	-1/+43
\|/ / / /
* \| \| \|	Merge branch 'zj-find-license-opt-out' into 'master'	Grzegorz Bizon	2018-04-09	2	-1/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move FindLicense RPC to OPT OUT status See merge request gitlab-org/gitlab-ce!18228
\| * \| \| \|	Move FindLicense RPC to OPT OUT status	Zeger-Jan van de Weg	2018-04-06	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Acceptance testing was successful in https://gitlab.com/gitlab-org/gitaly/issues/1058. So this is moved to OPT OUT. Part of https://gitlab.com/gitlab-org/gitaly/issues/1026
* \| \| \| \|	Merge branch 'blackst0ne-rails5-add-rails-controller-testing-gem' into 'master'	Rémy Coutable	2018-04-09	2	-0/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Add `rails-controller-testing` gem See merge request gitlab-org/gitlab-ce!18242
\| * \| \| \| \|	[Rails5] Add `rails-controller-testing` gemblackst0ne-rails5-add-rails-controller-testing-gem	blackst0ne	2018-04-08	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Rails 5.0 `assert_template` and `assigns()` have been extracted to the `rails-controller-testing` gem. https://github.com/rails/rails/pull/20138/files This commit adds this gem for rails5.
* \| \| \| \| \|	Merge branch 'sh-fix-issue-45152' into 'master'	Grzegorz Bizon	2018-04-09	3	-4/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix undefined method `one?` when pushing to an existing merge request Closes #45152 See merge request gitlab-org/gitlab-ce!18243
\| * \| \| \| \| \|	Fix undefined method `one?` when pushing to an existing merge requestsh-fix-issue-45152	Stan Hu	2018-04-07	3	-4/+16
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	An untested code path was triggering an Exception because Fixnum doesn't have `one?` implemented in Rails, while arrays and collections do. Closes #45152
* \| \| \| \| \|	Merge branch '44224-remove-gl' into 'master'	Phil Hughes	2018-04-09	15	-33/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove modal boards code from global namepsace See merge request gitlab-org/gitlab-ce!18222
\| * \| \| \| \| \|	Remove modal store and mixins from global scope44224-remove-gl	Filipa Lacerda	2018-04-06	15	-33/+33
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'blackst0ne-rails5-replace-true-values-with-false-values' into ↵	Sean McGivern	2018-04-09	1	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' [Rails5] Add FALSE_VALUES constant to Service#boolean_accessor See merge request gitlab-org/gitlab-ce!18240
\| * \| \| \| \| \| \|	[Rails5] Add FALSE_VALUES constant to Service#boolean_accessorblackst0ne-rails5-replace-true-values-with-false-values	blackst0ne	2018-04-08	1	-1/+5
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Rails 5.0 the `ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES` constant has been removed [1] and the remaining `FALSE_VALUES` constant has been moved to `ActiveModel::Type::Boolean` [2] [1]: https://github.com/rails/rails/commit/a502703c3d2151d4d3b421b29fefdac5ad05df61 [2]: https://github.com/rails/rails/commit/9cc8c6f3730df3d94c81a55be9ee1b7b4ffd29f6
* \| \| \| \| \| \|	Merge branch '32617-fix-template-selector-menu-visibility' into 'master'	Phil Hughes	2018-04-09	4	-1/+77
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Template selectors menu title mistakenly shown after toggling previewed changes" Closes #32617 See merge request gitlab-org/gitlab-ce!18118
\| * \| \| \| \| \| \|	Fix template selector menu visibility	Fabian Schneider	2018-04-08	4	-1/+77
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-handle-legacy-archive-requests' into 'master'	Douwe Maan	2018-04-09	2	-2/+13
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle legacy repository archive requests with no ref given Closes #45154 See merge request gitlab-org/gitlab-ce!18246
\| * \| \| \| \| \|	Handle legacy repository archive requests with no ref givensh-handle-legacy-archive-requests	Stan Hu	2018-04-08	2	-2/+13
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The legacy endpoint requires no reference and defaults to the root ref. Closes #45154
* \| \| \| \| \|	Merge branch 'winh-badges-docs' into 'master'	Douwe Maan	2018-04-08	6	-3/+83
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add user documentation for badges Closes #41174 and #41176 See merge request gitlab-org/gitlab-ce!18200
\| * \| \| \| \| \|	Add user documentation for badges	Winnie Hellmann	2018-04-08	6	-3/+83
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'winh-41174-projects-groups-badges-ui' into 'master'	Douwe Maan	2018-04-08	46	-13/+3021
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Projects and groups badges settings UI Closes #41174 and #41176 See merge request gitlab-org/gitlab-ce!17114
\| * \| \| \| \|	Projects and groups badges settings UI	Francisco Javier López	2018-04-08	46	-13/+3021
\|/ / / / /
* \| \| \| \|	Merge branch '31591-project-deploy-tokens-to-allow-permanent-access' into ↵	Kamil Trzciński	2018-04-07	47	-38/+1010
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Create Project Deploy Tokens to allow permanent access to repo and registry Closes #31591 See merge request gitlab-org/gitlab-ce!17894
\| * \| \| \| \|	Use proper auth_scope for deploy token	Kamil Trzciński	2018-04-07	2	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Handle limit for datetime attributes on MySQL	Mayra Cabrera	2018-04-06	12	-55/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The TIMESTAMP data type is used for values that contain both date and time parts. TIMESTAMP has a range of '1970-01-01 00:00:01' UTC to '2038-01-19 03:14:07' UTC. A Forever lib class was included to handle future dates for PostgreSQL and MySQL, also changes were made to DeployToken to enforce Forever.date Also removes extra conditional from JwtController
\| * \| \| \| \|	Modifies index on DeployTokens to use id	Mayra Cabrera	2018-04-06	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Handles default expires_at date directly into DeployToken model	Mayra Cabrera	2018-04-06	6	-7/+17
\| \| \| \| \| \|
\| * \| \| \| \|	Removes deploy tokens presenter	Mayra Cabrera	2018-04-06	4	-37/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Addresses database comments	Mayra Cabrera	2018-04-06	12	-26/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adds a default on expires_at datetime - Modifies deploy tokens views to handle default expires at value - Use datetime_with_timezone where possible - Remove unused scopes
\| * \| \| \| \|	Fix form javascript	Kamil Trzciński	2018-04-06	4	-19/+25
\| \| \| \| \| \|
\| * \| \| \| \|	Increase test suite around deploy tokens behavior	Mayra Cabrera	2018-04-06	17	-220/+144
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, fixes broken specs
\| * \| \| \| \|	Fixes broken schema and minor changes	Mayra Cabrera	2018-04-06	7	-12/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Get rid of Redis when dealing with deploy tokens	Kamil Trzciński	2018-04-06	11	-87/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We use controller actions to pass a newly created token and errors
\| * \| \| \| \|	Fix and optimise DB schema	Kamil Trzciński	2018-04-06	3	-21/+19
\| \| \| \| \| \|
\| * \| \| \| \|	Include ProjectDeployTokens	Mayra Cabrera	2018-04-06	26	-132/+197
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also: - Changes scopes from serializer to use boolean columns - Fixes broken specs
\| * \| \| \| \|	Support Deploy Tokens properly without hacking abilities	Kamil Trzciński	2018-04-06	8	-28/+43
\| \| \| \| \| \|
\| * \| \| \| \|	Addreses backend review suggestions	Mayra Cabrera	2018-04-06	13	-20/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Remove extra method for authorize_admin_project - Ensure project presence - Rename 'read_repo' to 'read_repository' to be more verbose
\| * \| \| \| \|	Removes logic from Jwt and handle different scenarios on Gitlab::Auth	Mayra Cabrera	2018-04-06	7	-71/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- When using 'read_repo' password and project are sent, so we used both of them to fetch for the token - When using 'read_registry' only the password is sent, so we only use that for fetching the token
\| * \| \| \| \|	Fix i18n on deploy_token views	Mayra Cabrera	2018-04-06	7	-25/+25
\| \| \| \| \| \|
\| * \| \| \| \|	Addreses frontend review	Mayra Cabrera	2018-04-06	8	-27/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also fixes spec failures on presenter and docs
\| * \| \| \| \|	Add documentation for DeployToken	Mayra Cabrera	2018-04-06	5	-4/+84
\| \| \| \| \| \|
\| * \| \| \| \|	Implement read_registry for DeployTokens	Mayra Cabrera	2018-04-06	2	-10/+40
\| \| \| \| \| \|