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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'ee-5514-fix-epic-collapsed-sidebar-label-click' into 'master'	Filipa Lacerda	2018-04-27	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	CE Backport: Reveal labels dropdown when labels icon is clicked on collapsed Epic sidebar See merge request gitlab-org/gitlab-ce!18611
\| *	Export class as default	Kushal Pandya	2018-04-27	1	-1/+1
\| \|
* \|	Merge branch 'qa-add-more-key-tests' into 'master'	Grzegorz Bizon	2018-04-27	1	-3/+3
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Add more QA SSH key tests Closes gitlab-qa#183 See merge request gitlab-org/gitlab-ce!17662
\| *	Merge remote-tracking branch 'upstream/master' into qa-add-more-key-tests	Lin Jen-Shin	2018-04-25	20	-30/+87
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (36 commits) Change language to be more inclusive of those with accessibility requirements Show group id in group settings Cleanup after adding MR diff's commit_count (try 2) Mock Pager in Karma tests Backport dev env check for storage settings deprecation Do not preload settings Update import on actions file to fix conflict when rewire plugin was added Broken link fix Make /copy_metadata only handle the first issuable passed Allow admins to push to empty repos Only show push-to-master authorized users Add documentation about resetting the runner registration token Document externally hosted LFS objects Align project avatar on small viewports fix CI BABEL_ENV variable document the spyOnDependency method disable sourcemaps when generating coverage report to avoid out-of-memory errors only apply rewire plugin when running karma tests fix illegal references to "this" in module context add default exports to prevent rewire plugin from breaking vuex ...
\| * \	Merge remote-tracking branch 'upstream/master' into qa-add-more-key-tests	Lin Jen-Shin	2018-04-24	60	-732/+1306
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (86 commits) Fix unassign slash command preview Add CHANGELOG entry Show Runner's description on job's page Fix an N+1 for MRs from forks on the MR index page Improve documentation of SSRF protection Replace find file project spinach tests with RSpec Fix docs typo for ci/lint [Backport] Burndown chart for group milestone Bump lograge to 0.10.0 and remove monkey patch Add Capybara debugging methods to docs Update CHANGELOG.md for 10.7.1 Add missing changelog entry Resolve "Avatar URLs are wrong when using a CDN path and Object Storage" Fix users not seeing labels from private groups when being a member of a child project Update doorkeeper for: Update links to /ci/lint with ones to project ci/lint Resolve "Namespace factory is problematic" Auth::User classes refactor adds should_save? Replace define_method with alias_method in Omniauth Controllers Describe workaround when restore fails because of `Errno::EBUSY` ...
\| * \ \	Merge remote-tracking branch 'upstream/master' into qa-add-more-key-tests	Lin Jen-Shin	2018-04-23	184	-1168/+2711
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (166 commits) Flowdock uses Gitaly, not Grit Removes 'no job log' from trace action Fix missing namespace for some internal users Dedupe yarn dependencies Downgrade MySQL CI service from 8.0 to 5.7 Atomic internal ids for all models Add documentation on how to configure Redis Sentinel by persistent class Update CHANGELOG.md for 10.7.0 Update index.md Resolve "Text from the diff is showing within a table header inside the discussion after the discussion is resolved" Don't include lfs_file_locks data in export bundle Documentation: Frontend Building Checklist Fix a documentation typo for GitLab pages Refactored activity calendar Add an API endpoint to download git repository snapshots Fix issues without links when added from boards new issue modal Respect visibility options and description when importing project from template Resolve "Improve tooltips of collapsed sidebars" Update Container Scanning documentation Fix typo in vue.md ...
\| * \| \| \|	Use qa selectors for secret variables	Lin Jen-Shin	2018-04-21	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The problem of using .js-ci-variable-input-value is that, whenever the value is hidden, then this selector won't be set, instead, .js-secret-value-placeholder would be set. If we just fill the value, the value is revealed. But if we visit this later, the values were be hidden. This means we don't have a consistent way to count the values. Adding an unique qa selector to both revealed and hidden values would make it easier to track the values. To make it look more consistent, let's also do the same for the key.
* \| \| \| \|	Clear refresh interval when MRWidgetFailedToMerge component is destroyed	Winnie Hellmann	2018-04-26	1	-49/+53
\| \| \| \| \|
* \| \| \| \|	Reset milestone filter when clicking "Any Milestone" in dashboard	Winnie Hellmann	2018-04-26	1	-28/+45
\| \| \| \| \|
* \| \| \| \|	Merge branch 'pravi/gitlab-ce-remove-vendored-peek' into 'master'	Sean McGivern	2018-04-26	5	-33/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `peek-performance_bar` from the performance bar See merge request gitlab-org/gitlab-ce!18597
\| * \| \| \| \|	remove peek performance_bar	Pirate Praveen	2018-04-26	5	-33/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Fix calendar day position	Clement Ho	2018-04-26	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'restore-size-and-position-for-fork-icon' into 'master'	Rémy Coutable	2018-04-26	3	-2/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore size and position for fork icon See merge request gitlab-org/gitlab-ce!18449
\| * \| \| \| \| \|	Restore size and position for fork icon	George Tsiolis	2018-04-18	3	-2/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Nick Thomas	2018-04-26	48	-209/+325
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'ide-temp-file-folder-fixes' into 'master'	Filipa Lacerda	2018-04-26	13	-118/+176
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed bugs with IDE new directory Closes #44838 See merge request gitlab-org/gitlab-ce!18274
\| \| * \ \ \ \ \ \	Merge branch 'master' into ide-temp-file-folder-fixes	Phil Hughes	2018-04-25	71	-758/+1429
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	force modified icon in tree list & tab bar	Phil Hughes	2018-04-25	3	-2/+11
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into ide-temp-file-folder-fixes	Phil Hughes	2018-04-23	48	-257/+625
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	added line height to label in modal	Phil Hughes	2018-04-19	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed spec because of object key change
\| \| * \| \| \| \| \| \| \| \|	fixed failing commit actions spec	Phil Hughes	2018-04-19	1	-8/+5
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into ide-temp-file-folder-fixes	Phil Hughes	2018-04-19	69	-554/+1330
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	added spec to new file dropdown	Phil Hughes	2018-04-19	1	-46/+44
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	fixed alignment of icon	Phil Hughes	2018-04-18	5	-6/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	auto open new folder when creating item scroll dropdown into view when opening
\| \| * \| \| \| \| \| \| \| \| \|	Fixed bugs with IDE new directory	Phil Hughes	2018-04-18	9	-67/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44838
\| * \| \| \| \| \| \| \| \| \| \|	Resolve "User deletion modal with same info for delete user / delete user ↵	schwedenmut	2018-04-26	3	-7/+6
\| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and contributions"
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'zj-storage-path-deprecation' into 'master'	Douwe Maan	2018-04-25	11	-45/+45
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Legacy disk path refactor Closes gitaly#1111 See merge request gitlab-org/gitlab-ce!18364
\| \| * \| \| \| \| \| \| \| \| \|	Gitlab::Shell works on shard name, not path	Zeger-Jan van de Weg	2018-04-25	11	-45/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Direct disk access is done through Gitaly now, so the legacy path was deprecated. This path was used in Gitlab::Shell however. This required the refactoring in this commit. Added is the removal of direct path access on the project model, as that lookup wasn't needed anymore is most cases. Closes https://gitlab.com/gitlab-org/gitaly/issues/1111
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '45398-fix-rss-button' into 'master'	Tim Zallmann	2018-04-25	1	-4/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tabs container styles to make RSS button clickable Closes #45398 See merge request gitlab-org/gitlab-ce!18559
\| \| * \| \| \| \| \| \| \| \| \| \|	Remove relative positioning for tabs container to restore RSS button	Kushal Pandya	2018-04-24	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'restore-label-underline-color' into 'master'	Tim Zallmann	2018-04-25	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore label underline color Closes #44177 See merge request gitlab-org/gitlab-ce!18407
\| \| * \| \| \| \| \| \| \| \| \| \|	Restore label underline color	George Tsiolis	2018-04-16	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'accessible-text' into 'master'	Phil Hughes	2018-04-25	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change instruction text to be more inclusive of those with accessibility requirements See merge request gitlab-org/gitlab-ce!18386
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Change language to be more inclusive of those with accessibility requirements	Mark Lapierre	2018-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare change for internationalization Update locale/gitlab.pot
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Show group id in group settings	George Tsiolis	2018-04-25	2	-0/+9
\| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jprovazn-migrate-missing-commit-counts' into 'master'	Sean McGivern	2018-04-25	1	-4/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migration cleanup for merge request's commit_count (rev 1) See merge request gitlab-org/gitlab-ce!17567
\| \| * \| \| \| \| \| \| \| \| \| \|	Cleanup after adding MR diff's commit_count (try 2)	Jan Provaznik	2018-04-25	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'align-project-avatar-on-small-viewports' into 'master'	Phil Hughes	2018-04-25	1	-4/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align project avatar on small viewports Closes #36585 See merge request gitlab-org/gitlab-ce!18513
\| \| * \| \| \| \| \| \| \| \| \| \|	Align project avatar on small viewports	George Tsiolis	2018-04-23	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'patch-29' into 'master'	Rémy Coutable	2018-04-24	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Broken link fix See merge request gitlab-org/gitlab-ce!18564
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Broken link fix	Ana Karabanova 🐱	2018-04-24	1	-1/+1
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'matbaj/gitlab-ce-add-inherit-command' into 'master'	Rémy Coutable	2018-04-24	1	-0/+20
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add copy_metadata quick action Closes #38450 See merge request gitlab-org/gitlab-ce!18497
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into matbaj/gitlab-ce-add-inherit-command	Sean McGivern	2018-04-24	51	-722/+880
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Make /copy_metadata only handle the first issuable passed	Sean McGivern	2018-04-24	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into matbaj/gitlab-ce-add-inherit-command	Sean McGivern	2018-04-19	1265	-11822/+24290
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed inconsistent descriptions and refactored reference checking	Mateusz Bajorski	2018-03-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed typos and improved reference checking	Mateusz Bajorski	2018-03-03	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed command name to copy_metadata and added MR support	Mateusz Bajorski	2018-03-03	1	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Inherit quick action	Mateusz Bajorski	2018-03-03	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #38450
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-fix-maintainer-push-error' into 'master'	Douwe Maan	2018-04-24	5	-20/+32
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors on pushing/editing files on empty repositories Closes #44618 and #42583 See merge request gitlab-org/gitlab-ce!18462