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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into 36917-branch-tooltip36917-branch-tooltip	Filipa Lacerda	2017-08-30	51	-163/+675
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (26 commits) Fix invalid attribute used for time-ago-tooltip component Update latest artifacts doc Update share project with groups docs Remove tooltips from new sidebar Use `git update-ref --stdin -z` to delete refs Don't use public_send in destroy_conditionally! helper Fix MySQL failure for emoji autocomplete Replace 'project/user_lookup.feature' spinach test with an rspec analog Add changelog Add time stats to issue and merge request API end points Resolve new N+1 by adding preloads and metadata to issues end points Add missing N+1 test to issues spec Add time stats to API schema for issue and merge request end points Add time stats documentation to issue and merge request end points Improve migrations using triggers Increase z-index of dropdowns Just use a block Fix tests Try to make reserved ref names more obvious Resolve feedback on the MR: ...
\| *	Merge branch 'dropdown-z-index-update' into 'master'	Filipa Lacerda	2017-08-30	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase z-index of dropdowns Closes #36766 and #36866 See merge request !13889
\| \| *	Increase z-index of dropdownsdropdown-z-index-update	Phil Hughes	2017-08-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #36866, #36766
\| * \|	Merge branch 'fix-timeago-tooltip-attribute' into 'master'	Filipa Lacerda	2017-08-30	2	-1/+11
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix invalid attribute used for time-ago-tooltip component Closes #37163 See merge request !13899
\| \| * \|	Fix invalid attribute used for time-ago-tooltip component	Clement Ho	2017-08-30	2	-1/+11
\| \|/ /
\| * \|	Merge branch 'docs-improve-latest-artifacts' into 'master'	Marcia Ramos	2017-08-30	1	-6/+11
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update latest artifacts doc See merge request !13924
\| \| * \|	Update latest artifacts doc	Fabio Busatto	2017-08-30	1	-6/+11
\| \|/ /
\| * \|	Merge branch '36807-gc-unwanted-refs-after-import' into 'master'	Douwe Maan	2017-08-30	13	-14/+194
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unwanted refs after importing a project Closes #36807 See merge request !13766
\| \| * \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-08-31	21	-319/+310
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	36807-gc-unwanted-refs-after-import * upstream/master: Don't use public_send in destroy_conditionally! helper Fix MySQL failure for emoji autocomplete max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably) Replace 'project/user_lookup.feature' spinach test with an rspec analog Move GPG signed commits docs to new location
\| \| * \| \|	Use `git update-ref --stdin -z` to delete refs36807-gc-unwanted-refs-after-import	Lin Jen-Shin	2017-08-30	5	-5/+53
\| \| \| \| \|
\| \| * \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-08-30	577	-3841/+8865
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	36807-gc-unwanted-refs-after-import * upstream/master: (225 commits) Add changelog entry Backports EE 2756 logic to CE. Make rubocop happy Make profile settings dropdown consistent Add filter by my reaction Update spec initialization with it being a shared component Update identicon path and selector Renamed to `identicon` and make shared component Merge branch 'master-i18n' into 'master' Fix broken Frontend JS guide Replace 'project/star.feature' spinach test with an rspec analog Adds position fixed to right sidebar Fixes the margin of the top buttons of the pipeline page Remove commented out code Better align fallback image emojis Decrease Metrics/CyclomaticComplexity threshold to 15 Add changelog Respect the default visibility level when creating a group Further break with_repo_branch_commit into parts Make sure inspect doesn't generate crazy string ...
\| \| * \| \| \|	Just use a block	Lin Jen-Shin	2017-08-29	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Fix tests	Lin Jen-Shin	2017-08-28	2	-8/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Try to make reserved ref names more obvious	Lin Jen-Shin	2017-08-25	5	-10/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So that whenever we want to reserve more, we're aware, and don't mess it up.
\| \| * \| \| \|	Resolve feedback on the MR:	Lin Jen-Shin	2017-08-25	5	-47/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13766 * Rename AfterImportService * Use constants * Move Git operations to Gitlab::Git::Repository * Use Regexp.union
\| \| * \| \| \|	Move to Projects::HousecleaningService	Lin Jen-Shin	2017-08-24	5	-49/+47
\| \| \| \| \| \|
\| \| * \| \| \|	Use block rather than just b	Lin Jen-Shin	2017-08-24	1	-4/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Just use @project directly	Lin Jen-Shin	2017-08-24	1	-4/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Just use methods over constants, so that we could	Lin Jen-Shin	2017-08-24	2	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	take the advantage that if they're not used, we could garbage collect those data, reducing memory footprint.
\| \| * \| \| \|	Add changelog and tests	Lin Jen-Shin	2017-08-23	5	-3/+88
\| \| \| \| \| \|
\| \| * \| \| \|	Remove unwanted refs after importing a project	Lin Jen-Shin	2017-08-23	3	-1/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because we don't need them, and they would slow down the repository, keeping unneeded objects as well. We could also consider doing this in regular housekeeping.
\| * \| \| \| \|	Merge branch 'check-trigger-permissions-mysql' into 'master'	Douwe Maan	2017-08-30	6	-8/+137
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve migrations using triggers Closes #36633 See merge request !13666
\| \| * \| \| \| \|	Improve migrations using triggerscheck-trigger-permissions-mysql	Yorick Peterse	2017-08-29	6	-8/+137
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a bunch of checks to migrations that may create or drop triggers. Dropping triggers/functions is done using "IF EXISTS" so we don't throw an error if the object in question has already been dropped. We now also raise a custom error (message) when the user does not have TRIGGER privileges. This should prevent the schema from entering an inconsistent state while also providing the user with enough information on how to solve the problem. The recommendation of using SUPERUSER permissions is a bit extreme but we require this anyway (Omnibus also configures users with this permission). Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36633
\| * \| \| \| \| \|	Merge branch '28453-add-time-estimate-time-spent-to-api-issue-output' into ↵	Robert Speicher	2017-08-30	9	-17/+207
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add time stats to Issue and Merge Request API Closes #28453 See merge request !13335
\| \| * \| \| \| \| \|	Add changelog	Travis Miller	2017-08-29	1	-0/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add time stats to issue and merge request API end points	Travis Miller	2017-08-29	3	-13/+39
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Resolve new N+1 by adding preloads and metadata to issues end points	Travis Miller	2017-08-29	2	-5/+39
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add missing N+1 test to issues spec	Travis Miller	2017-08-29	1	-0/+12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add time stats to API schema for issue and merge request end points	Travis Miller	2017-08-29	2	-2/+14
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add time stats documentation to issue and merge request end points	Travis Miller	2017-08-29	2	-8/+110
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'remove-sidebar-title' into 'master'	Annabel Dunstone Gray	2017-08-30	6	-38/+47
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed tooltips from new sidebar Closes #35658 See merge request !13489
\| \| * \| \| \| \| \| \|	Remove tooltips from new sidebarremove-sidebar-title	Phil Hughes	2017-08-30	6	-38/+47
\| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35658
\| * \| \| \| \| \| \|	Merge branch 'harishsr-update-share-project-with-groups-docs' into 'master'	Marcia Ramos	2017-08-30	4	-8/+11
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update share project with groups docs See merge request !13843
\| \| * \| \| \| \| \|	Update share project with groups docs	Harish Ramachandran	2017-08-30	4	-8/+11
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'replace_spinach_user_lookup.feature' into 'master'	Robert Speicher	2017-08-30	5	-65/+49
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace 'project/user_lookup.feature' spinach test with an rspec analog See merge request !13863
\| \| * \| \| \| \| \|	Replace 'project/user_lookup.feature' spinach test with an rspec analog	blackst0ne	2017-08-30	5	-65/+49
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '37231-mysql2-error-unknown-column-award_emoji-count-on-master' ↵	Grzegorz Bizon	2017-08-30	4	-5/+7
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Mysql2::Error: Unknown column 'award_emoji.count' on master" Closes #37231 See merge request !13926
\| \| * \| \| \| \| \| \|	Don't use public_send in destroy_conditionally! helper	Sean McGivern	2017-08-30	3	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As we only override in two places, we could just ask for the value rather than the method name.
\| \| * \| \| \| \| \| \|	Fix MySQL failure for emoji autocomplete	Sean McGivern	2017-08-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Postgres lets you treat `count` as another alias for `COUNT(*)` apparently, even if that's not the actual alias used.
* \| \| \| \| \| \| \| \|	Merge branch 'master' into 36917-branch-tooltip	Filipa Lacerda	2017-08-30	87	-387/+822
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (28 commits) Add changelog entry max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably) Backports EE 2756 logic to CE. Make rubocop happy Make profile settings dropdown consistent Fixes the margin of the top buttons of the pipeline page Add changelog Respect the default visibility level when creating a group Further break with_repo_branch_commit into parts Make sure inspect doesn't generate crazy string It doesn't seem that rubocop is complaining for me Move GPG signed commits docs to new location Refactor Add a spec when ressource is not modified Move the logic to a concern Add changelog and doc Add tests for the unmodified header Update remaining endpoints Use commit date for branches and tags Conditionally destroy a ressource ...
\| * \| \| \| \| \| \| \|	Merge branch '37058-readme-md-header-image-scale-not-limited' into 'master'	Phil Hughes	2017-08-30	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "README.md: Header image scale not limited" Closes #37058, #37024, and #37230 See merge request !13869
\| \| * \| \| \| \| \| \| \|	max-width for lazy-loaded images (this was removed in the original MR ↵37058-readme-md-header-image-scale-not-limited	Tim Zallmann	2017-08-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	through merge resolution most probably)
\| * \| \| \| \| \| \| \| \|	Merge branch 'docs/gpg-move-under-repository' into 'master'	Marcia Ramos	2017-08-30	11	-249/+253
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move GPG signed commits docs to new location Closes #36804 See merge request !13872
\| \| * \| \| \| \| \| \| \|	Move GPG signed commits docs to new locationdocs/gpg-move-under-repository	Achilleas Pipinellis	2017-08-29	11	-249/+253
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/36804
\| * \| \| \| \| \| \| \|	Merge branch 'patch-24' into 'master'	Achilleas Pipinellis	2017-08-30	1	-3/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update backup_restore.md documentation regarding S3 and IAM profiles. See merge request !13871
\| \| * \| \| \| \| \| \| \|	Update backup_restore.md documentation regarding S3 and IAM profiles.	Kai Kontio	2017-08-28	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/commit/7f8ef19c411eceec207fef5d8459fbeaa40bf464 most likely broke the old configuration format where empty string aws_access_key_id & aws_secret_access_key were still OK. From 9.5 onwards moving backups to S3 using IAM profiles will fail if they are configured.
\| * \| \| \| \| \| \| \| \|	Merge branch 'perf.slow-issuable' into 'master'	Sean McGivern	2017-08-30	3	-17/+74
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Perf.slow issuable Closes #32844 See merge request !13685
\| \| * \| \| \| \| \| \| \| \|	Add changelog entry	Lin Jen-Shin	2017-08-30	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Further break with_repo_branch_commit into partsperf.slow-issuable	Lin Jen-Shin	2017-08-29	2	-20/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So it's more clear what could happen. Also add more tests about the behaviour.
\| \| * \| \| \| \| \| \| \| \|	Make sure inspect doesn't generate crazy string	Lin Jen-Shin	2017-08-29	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|