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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Change wording of MR comment boxmarkdown-slash-commands-text	Annabel Dunstone Gray	2017-02-13	1	-2/+2
\|
*	Merge branch 'fix/cycle-analytics-events-limit' into 'master'	Sean McGivern	2017-02-13	1	-0/+45
\|\ \| \| \| \| \| \| \| \|	Add limit to the number of events showed in cycle analytics See merge request !7743
\| *	fix spec	James Lopez	2017-02-07	1	-4/+5
\| \|
\| *	add spec	James Lopez	2017-02-06	2	-35/+44
\| \|
\| *	user project and not empty_project as we need the repo stuff	James Lopez	2017-02-06	1	-1/+1
\| \|
\| *	fix typo [ci skip]	James Lopez	2017-02-06	1	-2/+2
\| \|
\| *	Add limit to the number of events showed in cycle analytics and spec	James Lopez	2017-02-06	1	-0/+35
\| \|
* \|	Merge branch '27886_rebasing_fix' into 'master'	Sean McGivern	2017-02-13	1	-9/+32
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mark as WIP based on MR commits only Closes #27886 See merge request !9085
\| * \|	Mark as WIP based on MR commits only	Jarka Kadlecova	2017-02-13	1	-9/+32
\| \| \|
* \| \|	Merge branch '24976-start-of-line-mention' into 'master'	Sean McGivern	2017-02-13	3	-1/+284
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature to create directly addressed Todos when mentioned in beginning Closes #24976 See merge request !7926
\| * \| \|	Create directly_addressed Todos when mentioned in beginning of a line	Ershad Kunnakkadan	2017-02-08	3	-1/+284
\| \| \| \|
* \| \| \|	Merge branch '20732_member_exists_409' into 'master'	Sean McGivern	2017-02-13	2	-2/+344
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add member: Always return 409 when a member exists Closes #20732 See merge request !9093
\| * \| \| \|	Add member: Always return 409 when a member exists	Jarka Kadlecova	2017-02-10	2	-2/+344
\| \| \| \| \|
* \| \| \| \|	Merge branch 'issue_25900_2' into 'master'	Sean McGivern	2017-02-13	5	-0/+117
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gather issuable metadata to avoid n+ queries on index view Closes #25900 See merge request !9006
\| * \| \| \| \|	Gather issuable metadata to avoid n+ queries on index viewissue_25900_2	Felipe Artur	2017-02-09	5	-0/+117
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix_issue_from_milestone' into 'master'	Rémy Coutable	2017-02-13	3	-2/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue from milestone See merge request !8895
\| * \| \| \| \| \|	fix issue creation from milestone doesn't assign the milestone	wendy0402	2017-02-12	3	-2/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'concurrent-foreign-keys' into 'master'	Rémy Coutable	2017-02-13	2	-6/+103
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add method for creating foreign keys concurrently See merge request !9069
\| * \| \| \| \| \| \|	Enforce use of add_concurrent_foreign_keyconcurrent-foreign-keys	Yorick Peterse	2017-02-10	1	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a Rubocop rule to enforce the use of add_concurrent_foreign_key instead of the regular add_foreign_key method. This cop has been disabled for existing migrations so we don't need to change those.
\| * \| \| \| \| \| \|	Add method for creating foreign keys concurrently	Yorick Peterse	2017-02-10	1	-6/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method allows one to create foreign keys without blocking access to the source table, but only on PostgreSQL. When creating a regular foreign key the "ALTER TABLE" statement used for this won't return until all data has been validated. This statement in turn will acquire a lock on the source table. As a result this lock can be held for quite a long amount of time, depending on the number of rows and system load. By breaking up the foreign key creation process in two steps (creation, and validation) we can reduce the amount of locking to a minimum. Locking is still necessary for the "ALTER TABLE" statement that adds the constraint, but this is a fast process and so will only block access for a few milliseconds.
* \| \| \| \| \| \| \|	Merge branch 'rename_files_delete_service' into 'master'	Rémy Coutable	2017-02-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Files::DeleteService to Files::DestroyService See merge request !9110
\| * \| \| \| \| \| \|	Rename Files::DeleteService to Files::DestroyService	dixpac	2017-02-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reason for renaming is to comply with naming convention of services in codebase.
* \| \| \| \| \| \| \|	convert js-cookie dependency to an npm moduleclean-javascript-vendor-files	Mike Greiling	2017-02-11	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	convert timeago.js dependency to an npm module	Mike Greiling	2017-02-11	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix comment button test for slash commands	Annabel Dunstone Gray	2017-02-10	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix time tracking spec	Annabel Dunstone Gray	2017-02-10	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix issue boards sidebar alignment and sidebar toggle spec	Annabel Dunstone Gray	2017-02-10	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix failing conflicts test	Annabel Dunstone Gray	2017-02-10	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove fixed positioning from navbar	Annabel Dunstone Gray	2017-02-10	1	-1/+1
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'replace-teaspoon-references' into 'master'	Clement Ho	2017-02-10	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace teaspoon references with Karma Closes gitlab-com/gitlab-docs#68 See merge request !9011
\| * \| \| \| \| \| \|	Replace teaspoon references with Karmareplace-teaspoon-references	Clement Ho	2017-02-10	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch '27963-tooltips-jobs' into 'master'	Annabel Dunstone Gray	2017-02-10	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes tooltips in mini pipeline graph Closes #27963 and #28008 See merge request !9140
\| * \| \| \| \| \| \|	Fix broken test to use trigger in order to not take tooltip overlaping in ↵	Filipa Lacerda	2017-02-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	consideration
* \| \| \| \| \| \| \|	Merge branch 'rs-warden-blocked-users' into 'master'	Robert Speicher	2017-02-10	3	-54/+34
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't perform Devise trackable updates on blocked User records Closes #27519 See merge request !8915
\| * \| \| \| \| \| \| \|	Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-users	Robert Speicher	2017-02-10	3	-54/+34
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '1051-api-create-users-without-password' into 'master'	Rémy Coutable	2017-02-10	1	-0/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optionally make users created via the API set their password Closes #1051 See merge request !8957
\| * \| \| \| \| \| \| \|	Optionally make users created via the API set their password	Joost Rijneveld	2017-02-09	1	-0/+12
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '27336-add-environment-url-link-to-terminal-page' into 'master'	Kamil Trzciński	2017-02-10	1	-0/+16
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add environment URL link to terminal page" Closes #27336 See merge request !9107
\| * \| \| \| \| \| \| \|	Added env external link and light web terminal spec27336-add-environment-url-link-to-terminal-page	Luke "Jared" Bennett	2017-02-10	1	-0/+16
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'dz-nested-groups-members-page' into 'master'	Dmitriy Zaporozhets	2017-02-10	3	-0/+80
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nested groups members page See merge request !9062
\| * \| \| \| \| \| \| \|	Show parent group members for nested groupdz-nested-groups-members-page	Dmitriy Zaporozhets	2017-02-10	3	-0/+80
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'issue_27855' into 'master'	Rémy Coutable	2017-02-10	1	-5/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix admin_labels_spec.rb transient failure Closes #27855 See merge request !9135
\| * \| \| \| \| \| \| \|	Fix admin_labels_spec.rb transient failureissue_27855	Felipe Artur	2017-02-10	1	-5/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'test-for-current-gitlab-ci-yml' into 'master'	Rémy Coutable	2017-02-10	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure our current .gitlab-ci.yml is valid See merge request !9125
\| * \| \| \| \| \| \| \| \|	Make sure our current .gitlab-ci.yml is validtest-for-current-gitlab-ci-yml	Lin Jen-Shin	2017-02-10	1	-0/+10
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This could prevent errors described in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8970 Everything we're using right now, should be valid of course.
* \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-27974' into 'master'	Rémy Coutable	2017-02-10	2	-3/+24
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove a transient failure from spec/requests/api/groups_spec.rb Closes #27974 See merge request !9116
\| * \| \| \| \| \| \| \|	Remove a transient failure from spec/requests/api/groups_spec.rbrs-issue-27974	Robert Speicher	2017-02-09	2	-3/+24
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'protected-branch-dropdown-titles' into 'master'	Jacob Schatz	2017-02-10	1	-2/+10
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added header to protected branches access dropdowns See merge request !8774
\| * \| \| \| \| \| \| \|	Added header to protected branches access dropdownsprotected-branch-dropdown-titles	Phil Hughes	2017-01-26	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE part of https://gitlab.com/gitlab-org/gitlab-ee/issues/1294
* \| \| \| \| \| \| \| \|	Merge branch 'revert-0ef587b6' into 'master'	Filipa Lacerda	2017-02-09	2	-16/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Responsive title in diffs inline, side by side, with and without sidebar Closes #25709 See merge request !8707