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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-cop	Rémy Coutable	2017-06-02	14	-26/+26
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch '2361-pending-migrations-break-current-settings' into 'master'	Rémy Coutable	2017-06-02	1	-2/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Skip loading application settings from the database when migrations are pending Closes gitlab-ee#2361 See merge request !11842
\| *	Skip loading application settings from the database when migrations are pending	Nick Thomas	2017-06-02	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Various Rails initializers (metrics, sentry, etc) are run before migrations, which can lead to a mismatch between app/models/application_settings.rb and schema.
* \|	Merge branch '33242-create-project-for-user-api-ignores-path-parameter' into ↵	Sean McGivern	2017-06-02	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add optional path parameter and fix tests Closes #33242 See merge request !11868
\| * \|	Fix missing optional path parameter in "Create project for user" API33242-create-project-for-user-api-ignores-path-parameter	Athar Hameed	2017-06-02	1	-0/+1
\| \|/
* \|	Merge branch '28080-system-checks' into 'master'	Sean McGivern	2017-06-02	24	-478/+903
\|\ \ \| \|/ \|/\| \| \| \| \|	SystemCheck library for executing checks from a rake task See merge request !9173
\| *	Refactor and move things around to improve in YAGNI perspective	Gabriel Mazetto	2017-05-31	2	-25/+23
\| \|
\| *	Fix BasicExecutor specs	Gabriel Mazetto	2017-05-31	2	-27/+11
\| \|
\| *	Fixed and improved some existing checks and SystemCheck library	Gabriel Mazetto	2017-05-31	11	-76/+58
\| \|
\| *	Fix codestyle	Gabriel Mazetto	2017-05-31	4	-12/+8
\| \|
\| *	Improve Specs and some fixes	Gabriel Mazetto	2017-05-31	3	-8/+9
\| \|
\| *	Add ActiveUsers Check	Gabriel Mazetto	2017-05-31	2	-6/+19
\| \|
\| *	Refactor gitlab:app:checks to use SystemCheck	Gabriel Mazetto	2017-05-31	22	-504/+778
\| \|
\| *	Added specs for SystemCheck and custom matcher	Gabriel Mazetto	2017-05-31	1	-0/+7
\| \|
\| *	Fix a few method signature checks	Gabriel Mazetto	2017-05-31	2	-2/+2
\| \|
\| *	Some code-style fixes and documentation	Gabriel Mazetto	2017-05-31	4	-17/+76
\| \|
\| *	WIP SystemCheck library for executing checks from a rake task	Gabriel Mazetto	2017-05-31	5	-0/+111
\| \|
* \|	Merge branch 'add-new-rake-task-for-gettext' into 'master'	Douwe Maan	2017-06-01	1	-0/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add new Rake task to simplify the compilation of PO files See merge request !11864
\| * \|	Add new Rake task to simplify the compilation of PO filesadd-new-rake-task-for-gettext	Ruben Davila	2017-06-01	1	-0/+8
\| \| \|
* \| \|	Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`	Bob Van Landuyt	2017-06-01	8	-70/+68
\| \| \|
* \| \|	Merge branch 'zj-realtime-env-list' into 'master'	Kamil Trzciński	2017-06-01	1	-1/+7
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Realtime env list Closes #31701 See merge request !11333
\| * \|	Merge branch 'master' into zj-realtime-env-list	Z.J. van de Weg	2017-06-01	67	-508/+1594
\| \|\ \
\| * \ \	Merge branch 'master' into zj-realtime-env-list	Z.J. van de Weg	2017-05-25	15	-119/+418
\| \|\ \ \
\| * \| \| \|	Restore original comment [ci skip]	Z.J. van de Weg	2017-05-24	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Use etag caching for environments JSON	Z.J. van de Weg	2017-05-22	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For the index view, the environments can now be requested every 15 seconds. Any transition state of a projects environments will trigger a cache invalidation action. Fixes gitlab-org/gitlab-ce#31701
* \| \| \| \|	Merge branch '24196-protected-variables' into 'master'	Kamil Trzciński	2017-06-01	3	-1/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implementation for protected variables Closes #24196 See merge request !11688
\| * \ \ \ \	Merge branch 'master' into '24196-protected-variables'	Kamil Trzciński	2017-06-01	8	-21/+159
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 24196-protected-variables	Lin Jen-Shin	2017-06-01	17	-47/+243
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (141 commits) Add Documentation for GIT_CHECKOUT variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Use another scope to add the - prefix, feedback: Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions ...
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into 24196-protected-variables	Lin Jen-Shin	2017-05-31	15	-16/+366
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (89 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
\| * \ \ \ \ \ \	Merge branch 'master' into '24196-protected-variables'	Lin Jen-Shin (godfat)	2017-05-26	37	-429/+840
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \| \|	API and doc for protected variables	Lin Jen-Shin	2017-05-25	2	-1/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Frontend implementation, tests, and changelog	Lin Jen-Shin	2017-05-25	1	-0/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'migrate-old-artifacts' into 'master'	Grzegorz Bizon	2017-06-01	6	-35/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix data inconsistency issue for old artifacts by moving them to a currently used path Closes #32036 See merge request !11824
\| * \| \| \| \| \| \| \| \|	Add missing specs	Kamil Trzcinski	2017-06-01	5	-34/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix data inconsistency issue for old artifacts by moving them to a currently ↵	Kamil Trzcinski	2017-06-01	5	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	used path
* \| \| \| \| \| \| \| \| \|	Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master'	Rémy Coutable	2017-06-01	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing `can_push` parameter to POST /v3/deploy_keys See merge request !11607
\| * \| \| \| \| \| \| \| \|	Add missing `can_push` parameter to POST /v3/deploy_keys	Richard Clamp	2017-05-22	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The v3 API documentation claims that `can_push` is supported when adding a deploy_key. https://gitlab.com/gitlab-org/gitlab-ce/blob/8-16-stable/doc/api/deploy_keys.md#add-deploy-key Here we make good on this promise by adding `can_push` as an optional parameter so grape can route it. This was copied from the v4 API.
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix_diff_line_comments' into 'master'	Sean McGivern	2017-06-01	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: A diff comment on a change at last line of a file shows as two comments in discussion Closes #32353 See merge request !11802
\| * \| \| \| \| \| \| \| \| \|	Fix: A diff comment on a change at last line of a file shows as two comments ↵	Valery Sizov	2017-05-31	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in discussion
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-collapsed-blob' into 'master'	Sean McGivern	2017-06-01	9	-45/+51
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Consistent diff and blob size limit names See merge request !11776
\| * \| \| \| \| \| \| \| \| \|	Change no_limits to limitsdm-collapsed-blob	Douwe Maan	2017-05-31	6	-11/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix Diff#too_large? and specs	Douwe Maan	2017-05-30	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix Diff#to_hash and #init_from_hash	Douwe Maan	2017-05-30	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Consistent diff and blob size limit names	Douwe Maan	2017-05-29	9	-49/+50
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'trigger-source'	Grzegorz Bizon	2017-05-31	19	-64/+249
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \| \| \| \| \|	Add feature toggles through Flipper	Alejandro Rodríguez	2017-05-31	5	-2/+120
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-gitmodules-parsing' into 'master'	Grzegorz Bizon	2017-05-31	1	-17/+30
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make .gitmodules parsing more resilient to syntax errors Closes #26009 See merge request !11803
\| \| * \| \| \| \| \| \| \| \| \|	Remove entry variabledm-gitmodules-parsing	Douwe Maan	2017-05-31	1	-10/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Make .gitmodules parsing more resilient to syntax errors	Douwe Maan	2017-05-30	1	-16/+30
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-31	9	-41/+200
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (63 commits) Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions Check only a merge ability for protected actions Add tag_list param to project api Allow PostReceivePack to be enabled with Gitaly Remove some deprecated methods Add :owned param to ProjectFinder ...