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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Expose ChatName objects to slash commandsslash-commands-changes-for-chatops	Yorick Peterse	2018-02-23	3	-5/+26
\| \| \| \| \| \| \|	Instead of only exposing a User to slash commands we now also expose the ChatName object that the User object is retrieved from. This is necessary for GitLab Chatops as we need for example the user ID of the chat user.
*	Merge branch 'fix-500-for-invalid-upload-path' into 'master'	Sean McGivern	2018-02-22	3	-1/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 error when loading an invalid upload URL Closes gitlab-ee#4998 See merge request gitlab-org/gitlab-ce!17267
\| *	Fix 500 error when loading an invalid upload URL	Sean McGivern	2018-02-22	3	-1/+14
\| \|
* \|	Merge branch 'revert-3487441b' into 'master'	Sean McGivern	2018-02-22	1	-4/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'tc-info-version-check' into 'master'" See merge request gitlab-org/gitlab-ce!17269
\| * \|	Revert "Merge branch 'tc-info-version-check' into 'master'"revert-3487441b	Victor Wu	2018-02-21	1	-4/+1
\| \| \| \| \| \| \| \| \|	This reverts merge request !17257
* \| \|	Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-js	Rémy Coutable	2018-02-22	22	-44/+58
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Fix the groupLabelsPath in app/assets/javascripts/api.js	Rémy Coutable	2018-02-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch ↵	Filipa Lacerda	2018-02-22	5	-148/+93
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation' into 'master' Resolve "Followup to New design for cancel/stop pipeline confirmation" Closes #42886 See merge request gitlab-org/gitlab-ce!17106
\| * \ \	Merge branch 'master' into ↵42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation	Shah El-Rahman	2018-02-21	249	-1108/+936
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation
\| * \| \| \|	Remove use of callback in pipeline stop/retry modals	Shah El-Rahman	2018-02-16	5	-148/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make changes to names of events and variables Combine stop and retry modals into 1 Fix lint issues Add comment about usage of eventHub instead of props
* \| \| \| \|	Merge branch '43134-reduce-queries-pipelines-controller-show' into 'master'	Grzegorz Bizon	2018-02-22	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Controller Projects::PipelinesController#show executes more than 100 SQL queries" Closes #43134 See merge request gitlab-org/gitlab-ce!17168
\| * \| \| \| \|	Add inverse_of pipeline -> statuses -> pipeline (#43134)43134-reduce-queries-pipelines-controller-show	Dylan Griffith	2018-02-22	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dispatcher-import-batch-1' into 'master'	Jacob Schatz	2018-02-21	12	-80/+20
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use dynamic imports in dispatcher See merge request gitlab-org/gitlab-ce!17273
\| * \| \| \| \|	Use dynamic imports in dispatcher	Clement Ho	2018-02-21	12	-80/+20
\| \| \| \| \| \|
* \| \| \| \| \|	Rest of Dispatcher Refactor	Jacob Schatz	2018-02-21	45	-202/+188
\|/ / / / /
* \| \| \| \|	Use dynamic imports for project dispatcher paths	Clement Ho	2018-02-21	12	-75/+39
\| \| \| \| \|
* \| \| \| \|	#28481: Display time tracking totals on milestone page	Riccardo Padovani	2018-02-21	5	-15/+47
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge branch 'tc-info-version-check' into 'master'	Sean McGivern	2018-02-21	1	-1/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Be more transparent about the version check See merge request gitlab-org/gitlab-ce!17257
\| * \| \| \|	Add more info about data collected when version check is enabledtc-info-version-check	Toon Claes	2018-02-21	1	-1/+4
\| \|/ / /
* \| \| \|	Merge branch 'fix/new-project-path-input-overlapping' into 'master'	Clement Ho	2018-02-21	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix new project path input overlapping, height and radius #41811 Closes #41811 See merge request gitlab-org/gitlab-ce!16755
\| * \| \| \|	Fix new project path input overlapping	George Tsiolis	2018-02-14	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Max-width and height
* \| \| \| \|	Merge branch 'fix/change-event-body-label-font-size' into 'master'	Clement Ho	2018-02-21	5	-8/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apply new default and inline label design #34725 Closes #34725 See merge request gitlab-org/gitlab-ce!16956
\| * \| \| \| \|	Apply new default and inline label design	George Tsiolis	2018-02-15	5	-8/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '26039-Update-to-github-linguist5.3.x' into 'master'	Robert Speicher	2018-02-21	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update to github-linguist 5.3.x" Closes #26039 See merge request gitlab-org/gitlab-ce!17241
\| * \| \| \| \| \|	26039 - update github-linguist to 5.3.3 version	Ken	2018-02-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	26039 - add merge request id 26039 change due to lingust source file updates
* \| \| \| \| \| \|	Merge branch '35418-remove-underline-for-avatar' into 'master'	Clement Ho	2018-02-21	2	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove underline for avatar" Closes #35418 See merge request gitlab-org/gitlab-ce!17219
\| * \| \| \| \| \| \|	35418 - remove avatar underline	Ken	2018-02-20	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	35418 - update changelog
* \| \| \| \| \| \| \|	Merge branch 'refactor-issuable-finder-to-use-inheritance' into 'master'	Rémy Coutable	2018-02-21	8	-78/+107
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor IssuableFinder to extract model-specific logic See merge request gitlab-org/gitlab-ce!17236
\| * \| \| \| \| \| \|	Refactor IssuableFinder to extract model-specific logicrefactor-issuable-finder-to-use-inheritance	Sean McGivern	2018-02-21	8	-78/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By extracting a new `filter_items` method, we can override that in the IssuesFinder and MergeRequestsFinder separately, so we don't need checks that the model is the correct one, because we can just use the class we're in to know that. We can do the same for the VALID_PARAMS constant, by making it a class method.
* \| \| \| \| \| \| \|	Merge branch 'ce-3776-ci-view-for-sast' into 'master'	Phil Hughes	2018-02-21	5	-14/+22
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18n See merge request gitlab-org/gitlab-ce!17176
\| * \| \| \| \| \| \| \|	CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18nce-3776-ci-view-for-sast	Filipa Lacerda	2018-02-20	5	-14/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport common class name for the tab content Backport more changes
* \| \| \| \| \| \| \| \|	Merge branch '41461-project-members-slow-due-to-sql' into 'master'	Yorick Peterse	2018-02-21	1	-12/+45
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify database queries in MembersFinder and improve performance for Projects::ProjectMembersController#index Closes #41461 See merge request gitlab-org/gitlab-ce!17190
\| * \| \| \| \| \| \| \| \|	More readable SQL query.	Andreas Brandl	2018-02-21	1	-3/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix MembersFinder to never include group invitees.41461-project-members-slow-due-to-sql	Andreas Brandl	2018-02-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was the default behavior, because all members with `user_id` set to `null` were excluded.
\| * \| \| \| \| \| \| \| \|	Fix N+1 query problem for users on members view.	Andreas Brandl	2018-02-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For each member being rendered on Projects::ProjectMembersController#index, there was a query to the users table to retrieve the corresponding user: ``` SELECT "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1 ```
\| * \| \| \| \| \| \| \| \|	Use DISTINCT ON and translate to MySQL.	Andreas Brandl	2018-02-20	1	-16/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Realized window functions are not available in older MySQL versions either. Falling back to DISTINCT ON for postgresql and a convoluted translation for MySQL.
\| * \| \| \| \| \| \| \| \|	Simplify database queries in MembersFinder.	Andreas Brandl	2018-02-20	1	-11/+22
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #41461.
* \| \| \| \| \| \| \| \|	Merge branch '42877-snippets-dashboard-slow' into 'master'	Yorick Peterse	2018-02-21	2	-13/+39
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve query performance for Dashboard::SnippetsController#index Closes #42877 See merge request gitlab-org/gitlab-ce!17088
\| * \| \| \| \| \| \| \| \|	Rename use_conditions_only option to use_where_in.42877-snippets-dashboard-slow	Andreas Brandl	2018-02-20	2	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Avoid manual SQL for visibility level check.	Andreas Brandl	2018-02-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Cleanup access level shortcut.	Andreas Brandl	2018-02-20	1	-22/+17
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Allow choice between #where or #from.	Andreas Brandl	2018-02-20	2	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Immediately using #from here requires a lot of changes in other finders (e.g. IssuableFinder, TodosFinder). In all places where we use #merge, this goes completely the wrong way when passed in a relation that was built with `#from(...)`: The original query's FROM part gets completely replaced. This avoids changing all other places and focuses on improving SnippetFinder with the downside of two (small) codepaths to do the same thing.
\| * \| \| \| \| \| \| \| \|	Don't mess with table aliases.	Andreas Brandl	2018-02-20	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove duplication in Project methods.	Andreas Brandl	2018-02-20	2	-38/+21
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Push feature-related query part up.	Andreas Brandl	2018-02-20	2	-2/+30
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Shortcut when all levels visible.	Andreas Brandl	2018-02-20	1	-0/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Replace OR clause with UNION.	Andreas Brandl	2018-02-20	1	-1/+7
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	use DOMContentLoaded event over jQuery .ready to ensure execution ordermore-dispatcher-refactoring	Mike Greiling	2018-02-21	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	migrate admin:* to static bundle	Mike Greiling	2018-02-21	2	-4/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	migrate omniauth_callbacks:* to static bundle	Mike Greiling	2018-02-21	2	-8/+1
\| \| \| \| \| \| \| \| \|