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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Replace ci_status_path with pipeline_pathrc/use-existing-url-helper	Rémy Coutable	2017-11-14	1	-1/+1
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'	Kamil Trzciński	2017-11-14	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Do not allow jobs to be erased Closes #31771 See merge request gitlab-org/gitlab-ce!15216
\| *	Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-new	Shinya Maeda	2017-11-07	20	-82/+109
\| \|\
\| * \|	Do not allow jobs to be erased	Shinya Maeda	2017-11-06	1	-1/+1
\| \| \|
* \| \|	Merge branch 'bvl-refresh-member-listing-on-removal' into 'master'	Tim Zallmann	2017-11-13	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't perform a JS request when deleting a membership. Closes #39933 and #31720 See merge request gitlab-org/gitlab-ce!15344
\| * \| \|	Don't perform a JS request when deleting a membership.bvl-refresh-member-listing-on-removal	Bob Van Landuyt	2017-11-13	1	-1/+0
\| \| \| \|
* \| \| \|	Merge branch '3615-improve-welcome-screen' into 'master'	Tim Zallmann	2017-11-13	5	-86/+106
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorganize landing page for new users See merge request gitlab-org/gitlab-ce!15191
\| * \| \| \|	Use flexbox instead of bootstrap columns3615-improve-welcome-screen	Annabel Dunstone Gray	2017-11-08	3	-85/+76
\| \| \| \| \|
\| * \| \| \|	Add new icon; update content	Annabel Dunstone Gray	2017-11-08	3	-3/+4
\| \| \| \| \|
\| * \| \| \|	Add four blocks to each welcome page	Annabel Dunstone Gray	2017-11-08	2	-10/+28
\| \| \| \| \|
\| * \| \| \|	Update new project icon	Annabel Dunstone Gray	2017-11-08	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Reorganize landing page for new users	Annabel Dunstone Gray	2017-11-08	3	-76/+86
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Annabel Dunstone Gray	2017-11-13	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'37174-wrong-case-for-roles-header-in-allowed-to-create-project-settings-dropdown' into 'master' Resolve "Wrong case for 'Roles' header in 'Allowed to create' project settings dropdown" Closes #37174 See merge request gitlab-org/gitlab-ce!15326
\| * \| \| \| \|	Add missing CSS class to capitalize the protectec tag header dropdown37174-wrong-case-for-roles-header-in-allowed-to-create-project-settings-dropdown	Jose Ivan Vargas	2017-11-10	1	-1/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch '40068-runner-sorting-regression' into 'master'	Annabel Dunstone Gray	2017-11-13	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert a regression on runners sorting (!15134) Closes #40068 See merge request gitlab-org/gitlab-ce!15341
\| * \| \| \| \|	Revert a regression on runners sorting (!15134)	Takuya Noguchi	2017-11-12	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge branch 'issue_39238' into 'master'	Sean McGivern	2017-11-13	1	-3/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix image diff notes email Closes #39238 See merge request gitlab-org/gitlab-ce!15299
\| * \| \| \| \|	Fix image diff notes email	Felipe Artur	2017-11-13	1	-3/+8
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'dm-authorize-admin-oauth-application' into 'master'	Sean McGivern	2017-11-13	1	-5/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent error when authorizing an admin-created OAauth application without a set owner Closes #40086 See merge request gitlab-org/gitlab-ce!15349
\| * \| \| \| \|	Prevent error when authorizing an admin-created OAauth application without a ↵	Douwe Maan	2017-11-13	1	-5/+8
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	set owner
* \| \| \| \|	Add externalized strings	George Andrinopoulos	2017-11-11	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Move total time spend calculation to milestoneish	George Andrinopoulos	2017-11-11	1	-5/+5
\| \| \| \| \|
* \| \| \| \|	Fix static code analysis offence	George Andrinopoulos	2017-11-11	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Fix collapsed sidebar messages and icon	George Andrinopoulos	2017-11-11	2	-4/+11
\| \| \| \| \|
* \| \| \| \|	Add total time spent to milestones	George Andrinopoulos	2017-11-11	1	-0/+10
\|/ / / /
* \| \| \|	Merge branch '32059-fix-oauth-phishing' into 'security-10-1'	Douwe Maan	2017-11-10	3	-6/+16
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization See merge request gitlab/gitlabhq!2205
* \| \|	Merge branch 'dm-notes-for-commit-id' into 'master'	Rémy Coutable	2017-11-08	1	-6/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Commit#notes and Note.for_commit_id when possible to make sure we use all indexes available to us Closes #34509 See merge request gitlab-org/gitlab-ce!15253
\| * \| \|	Use Commit#notes and Note.for_commit_id when possible to make sure we use ↵dm-notes-for-commit-id	Douwe Maan	2017-11-08	1	-6/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	all the indexes available to us
* \| \| \|	Merge branch 'jivl-add-missing-strings-tag-page' into 'master'	Tim Zallmann	2017-11-08	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added missing strings to prepare the tags page for internationalization See merge request gitlab-org/gitlab-ce!15256
\| * \| \| \|	Added missing strings to prepare the tags page for internationalizationjivl-add-missing-strings-tag-page	Jose Ivan Vargas	2017-11-07	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'feature-change-signout-route' into 'master'	Douwe Maan	2017-11-08	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change Sign Out route from a DELETE to a GET Closes #39708 See merge request gitlab-org/gitlab-ce!15231
\| * \| \| \| \|	Change Sign Out route from a DELETE to a GET	Joe Marty	2017-11-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #39708
* \| \| \| \| \|	Merge branch '37824-many-branches-lock-server' into 'master'	Annabel Dunstone Gray	2017-11-07	3	-14/+22
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project with many branches can lock server running "git branch --contains XXX" Closes #37824 See merge request gitlab-org/gitlab-ce!14812
\| * \| \| \| \| \|	Address discussions on the ME	Mayra Cabrera	2017-11-07	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fixes thinner right border on the limit box - Adds and 'elsif' on @branches for the scenario in which a commit is not related to a branch - Fixes small details on limit_exceeded_for_message partial
\| * \| \| \| \| \|	Addresses front & backend comments	Mayra Cabrera	2017-11-06	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Improves CSS files by reusing existing code - Changes logic in views to avoid future problems in translations
\| * \| \| \| \| \|	Modifies commit branches section	Mayra Cabrera	2017-11-06	3	-9/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Display the default branch (if the limit is not exceeded) - Requires '...' to be clicked before showing the rest of the branches and/or tags - Fixes haml lints
\| * \| \| \| \| \|	Add styles for branch & tags boxes	Mayra Cabrera	2017-11-02	3	-7/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Create a partial for limit exceeded message - Modifies specs to adjust new scenarios
\| * \| \| \| \| \|	Add UI/UX improvements	Mayra Cabrera	2017-11-01	1	-12/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Leave 'too many tags to search' always visible - Add different message to the branch/tags so it states its unavailable
\| * \| \| \| \| \|	optimize branching logic	Brett Walker	2017-10-17	1	-6/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	implemented using an ivar, and added specs	Brett Walker	2017-10-13	1	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	moved throttling into the controller. if we hit the throttling	Brett Walker	2017-10-12	1	-12/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	threshhold, a message is shown indicating we didn't perform the search
* \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Kamil Trzcinski	2017-11-07	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add-ingress-to-cluster-applications
\| * \ \ \ \ \ \	Merge branch '38464-k8s-apps' into 'master'	Kamil Trzciński	2017-11-07	1	-4/+12
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for k8s cluster applications - Helm tiller installation See merge request gitlab-org/gitlab-ce!14908
\| * \ \ \ \ \ \ \	Merge branch '39798-revert-gear-animation' into 'master'	Clement Ho	2017-11-07	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert Auto DevOps gear animation Closes #39798 See merge request gitlab-org/gitlab-ce!15232
\| \| * \| \| \| \| \| \|	Revert Autodevops gear animation39798-revert-gear-animation	Eric Eastwood	2017-11-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39798
* \| \| \| \| \| \| \| \|	Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵	Kamil Trzcinski	2017-11-07	4	-5/+4
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into add-ingress-to-cluster-applications
\| * \| \| \| \| \| \| \|	Merge branch 'master' into 38464-k8s-apps	Shinya Maeda	2017-11-08	4	-5/+4
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	Merge branch '39878-commit-pipeline-reads-wrong-key' into 'master'	Tim Zallmann	2017-11-07	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix commit pipeline showing wrong status Closes #39878 See merge request gitlab-org/gitlab-ce!15238
\| \| \| * \| \| \| \| \| \|	Fix commit pipeline showing wrong status39878-commit-pipeline-reads-wrong-key	Filipa Lacerda	2017-11-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Refactor issuables index actions	Jarka Kadlecova	2017-11-07	2	-3/+2
\| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|