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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add a rubocop rule to check if a method 'redirect_to' is used without ↵31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-status	blackst0ne	2017-06-07	43	-52/+73
\| \| \| \|	explicitly set 'status' in 'destroy' actions of controllers
*	Limit non-administrators to adding 100 members at a time to groups and projects	Nick Thomas	2017-06-06	2	-6/+8
\|
*	Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'	Douwe Maan	2017-06-05	1	-8/+1
\|\ \| \| \| \| \| \| \| \|	backports changed import logic from pull mirroring feature into CE See merge request !11850
\| *	backports changed import logic from pull mirroring feature into CE	Tiago Botelho	2017-06-05	1	-8/+1
\| \|
* \|	Merge branch 'mk-fix-git-over-http-rejections' into 'master'	Douwe Maan	2017-06-05	3	-78/+25
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Git-over-HTTP rejections See merge request !11398
\| * \|	Refactor to let GitAccess errors bubble up	Michael Kozono	2017-06-05	1	-35/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No external behavior change. This allows `GitHttpController` to set the HTTP status based on the type of error. Alternatively, we could have added an attribute to GitAccessStatus, but this pattern seemed appropriate.
\| * \|	Refactor to let `GitAccess` check protocol config	Michael Kozono	2017-06-05	1	-10/+0
\| \| \| \| \| \| \| \| \| \| \| \|	This already works due to previous refactoring.
\| * \|	Move CI access logic into GitAccess	Michael Kozono	2017-06-05	3	-25/+15
\| \| \|
\| * \|	Refactor	Michael Kozono	2017-06-05	1	-4/+0
\| \| \|
\| * \|	Check disabled commands in GitAccess instead	Michael Kozono	2017-06-05	1	-4/+0
\| \| \|
\| * \|	Render GitAccess message if authorized	Michael Kozono	2017-06-05	1	-5/+1
\| \| \|
* \| \|	Merge branch '28694-hard-delete-user-from-admin-panel' into 'master'	Douwe Maan	2017-06-05	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow users to be hard-deleted from the admin panel Closes #28694 See merge request !11874
\| * \| \|	Support hard deletion in Admin::UsersController#destroy	Nick Thomas	2017-06-05	1	-1/+1
\| \| \| \|
\| * \| \|	Refactor the DeleteUserWorker	Nick Thomas	2017-06-05	1	-1/+1
\| \|/ /
* \| \|	Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master'	Tim Zallmann	2017-06-05	3	-3/+9
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Backport EE refactorings for Protected Tag EE-only functionality See merge request !11125
\| * \|	Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactorings	James Edwards-Jones	2017-05-31	3	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Improvements and refactorings were made while adding role based permissions for protected tags to EE. This doesn’t backport the feature, but should improve code quality and minimize divergence.
* \| \|	Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'	Phil Hughes	2017-06-05	1	-3/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. See merge request !11478
\| * \ \	Merge remote-tracking branch 'origin/master' into ↵	Luke "Jared" Bennett	2017-06-02	16	-148/+244
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix-realtime-edited-text-for-issues-9-3
\| * \| \| \|	Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.	Luke "Jared" Bennett	2017-05-31	1	-3/+10
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'zj-job-view-goes-real-time' into 'master'	Kamil Trzciński	2017-06-05	1	-0/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Initial implementation for real time job view Closes #31397 See merge request !11651
\| * \ \ \	Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-time	Kamil Trzcinski	2017-06-02	9	-23/+37
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-time	Z.J. van de Weg	2017-06-01	1	-1/+1
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Rename build to job	Z.J. van de Weg	2017-06-01	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Initial implementation for real time job view	Z.J. van de Weg	2017-05-31	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added the needed keys and paths to a new entity, BuildDetailsEntity. Not renaming BuildEntity to BuildBasicEntity on explicit request. Most code now has test coverage, but not all. This will be added on later commits on this branch. Resolves gitlab-org/gitlab-ce#31397
* \| \| \| \| \| \|	Merge branch '30469-convdev-index' into 'master'	Sean McGivern	2017-06-05	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ConvDev Index Closes #30469 See merge request !11377
\| * \| \| \| \| \| \|	Add Conversational Development Index page to admin panel	Taurie Davis, Simon Knox and Adam Niedzielski	2017-06-01	1	-0/+5
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'mabes/gitlab-ce-bypass-auto-login' into 'master'	Douwe Maan	2017-06-02	1	-1/+5
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow manual bypass of auto_sign_in_with_provider Closes #3786 See merge request !11884
\| * \| \| \| \| \|	Allow manual bypass of auto_sign_in_with_providermabes/gitlab-ce-bypass-auto-login	Maxime Besson	2017-06-02	1	-1/+5
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit lets a user bypass the automatic signin on the login form, in order to login with a technical (admin, etc) account Closes #3786 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'jouve/gitlab-ce-admin_keys' into 'master'	Rémy Coutable	2017-06-02	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	redirect to keys index instead of user index after a key is deleted See merge request !11856
\| * \| \| \| \|	redirect to keys index instead of user index after a key is deletedjouve/gitlab-ce-admin_keys	Cyril Jouve	2017-06-01	1	-2/+2
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch '31511-jira-settings' into 'master'	Sean McGivern	2017-06-02	1	-14/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599
\| * \| \| \| \|	Address review comments31511-jira-settings	Jarka Kadlecova	2017-06-02	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Add feature tests for improved JIRA settings	Jarka Kadlecova	2017-06-01	1	-7/+12
\| \| \| \| \| \|
\| * \| \| \| \|	simplify test&save actions when setting a service integration	Jarka Kadlecova	2017-06-01	1	-13/+19
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'zj-realtime-env-list' into 'master'	Kamil Trzciński	2017-06-01	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	22	-184/+326
\| \|\ \ \ \ \ \| \| \|/ / / /
\| * \| \| \| \|	Merge branch 'master' into zj-realtime-env-list	Z.J. van de Weg	2017-05-25	4	-8/+35
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Test etag caching router and incorporate review	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	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implementation for protected variables Closes #24196 See merge request !11688
\| * \| \| \| \| \|	Merge branch 'master' into '24196-protected-variables'	Kamil Trzciński	2017-06-01	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 24196-protected-variables	Lin Jen-Shin	2017-06-01	8	-126/+208
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	2	-1/+3
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	14	-62/+146
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \|	Frontend implementation, tests, and changelog	Lin Jen-Shin	2017-05-25	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dm-collapsed-blob' into 'master'	Sean McGivern	2017-06-01	5	-6/+6
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Consistent diff and blob size limit names See merge request !11776
\| * \| \| \| \| \| \|	Consistent diff and blob size limit names	Douwe Maan	2017-05-29	5	-6/+6
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' into 'trigger-source'	Grzegorz Bizon	2017-05-31	8	-126/+208
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \|	Merge branch 'rename-builds-controller' into 'master'	Kamil Trzciński	2017-05-31	5	-120/+196
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename BuildsController to JobsController Closes #30699 See merge request !11407
\| \| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-31	1	-1/+1
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...