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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Very RAW draft of changes needed to migrate storage to MinIOminio-poc-dr	Patricio Cano	2016-11-25	14	-25/+58
\|
*	Merge branch 'docs/rm-header-ids-from-university' into 'master'	Achilleas Pipinellis	2016-11-23	1	-6/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove heading ids from University docs Having ids in headings was preventing the ToC to render correctly See merge request !7720
\| *	Remove header ids from University docs	Achilleas Pipinellis	2016-11-23	1	-6/+6
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'fix-lfs-enabled-select-box' into 'master'	Stan Hu	2016-11-23	2	-6/+31
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix `LFS enabled` select box. A refactor of the project edit page caused the `lfs_enabled` setting to be reverted to a non functioning state. This MR fixes that. This will most likely need to be ported back to 8.13 and 8.14. 8.12 contained the correct code. Fixes #24645 Related commits: - ea3bbbdef86ae30fcf76baaba11a3fceb6d2aa03 - da07c2e4d3d382c05ec287ee60f639b870074fe7 cc @stanhu @dblessing @dbalexandre @rymai See merge request !7716
\| * \|	Added test that checks the correct select box is there for the LFS enabled ↵	Patricio Cano	2016-11-23	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \|	setting.
\| * \|	Fix `LFS enabled` select box.	Patricio Cano	2016-11-23	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \|	It was not displaying the proper value and had an out of place look to it.
* \| \|	Merge branch 'use-commit-author-if-possible' into 'master'	Sean McGivern	2016-11-23	2	-7/+4
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Use Commit#author so we share logic and cache See merge request !7715
\| * \|	Use Commit#author so we share logic and cache	Lin Jen-Shin	2016-11-24	2	-7/+4
\|/ / \| \| \| \| \| \|	Closes #24900
* \|	Merge branch 'move-timeago-to-vendor-dir' into 'master'	Alfredo Sumaran	2016-11-23	5	-12/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	move timeago.js to vendor directory ## What does this MR do? moves timeago.js into `/vendor/assets/javascripts` for consistency with other external javascript libraries. ## Are there points in the code the reviewer needs to double check? make sure timeago still works as it should...? I don't see how this could have broken anything. ## Why was this MR needed? consistency with our guidelines ## Does this MR meet the acceptance criteria? - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See discussion in [!6274](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6274#note_18625583) See merge request !7590
\| * \|	timeago should be a dependency of datetime_utilitymove-timeago-to-vendor-dir	Mike Greiling	2016-11-22	5	-8/+12
\| \| \|
\| * \|	move timeago.js to vendor directory	Mike Greiling	2016-11-22	2	-5/+4
\| \| \|
* \| \|	Merge branch '24851-collapsed-system-note-list-shadow-looks-weird' into ↵	Fatih Acet	2016-11-23	1	-3/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' fixes non-retina shadow and browser zoom issue ## What does this MR do? This MR closes #24851 and shadow issue for browser zoom ## Are there points in the code the reviewer needs to double check? NR ## Screenshots (if relevant) Ratina Display: ![normal](/uploads/18fb0e321eff55cb89413745413cfe8a/normal.png) Non Retina ![non-retina](/uploads/85ce8d3b22a025c251142bebe30c4401/non-retina.png) 110% zoom ![ratina](/uploads/bc0f2468ba780998e0e2b60a6d07e8db/ratina.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24851 See merge request !7712
\| * \| \|	fixes non-retina shadow and browser zoom issue	Nur Rony	2016-11-23	1	-3/+5
\| \| \| \|
* \| \| \|	Merge branch 'use-default-closest-if-available' into 'master'	Fatih Acet	2016-11-23	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use default `closest` if available! ## What does this MR do? We should use the default `Element.prototype.closest` if its available. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7706
\| * \| \| \|	Use default `closest` if available!use-default-closest-if-available	Luke "Jared" Bennett	2016-11-23	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'issue-boards-dragging-fix' into 'master'	Fatih Acet	2016-11-23	5	-5/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed dragging issues on issue boards ## What does this MR do? This fixes a few issues all at once: - Fixes an issue when dragging an issue to a list but actually removes another issue from the original list - Fixes an issue that caused the issue card to be appended to the bottom of the list - Fixes an issue when dragging an issue would actually open up the sidebar ## What are the relevant issue numbers? Closes #24654 See merge request !7701
\| * \| \| \|	Fixed dragging issues on issue boardsissue-boards-dragging-fix	Phil Hughes	2016-11-23	5	-5/+11
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Closes #24654
* \| \| \|	Merge branch 'custom-event-polyfill' into 'master'	Jacob Schatz	2016-11-23	1	-0/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds polyfill for CustomEvent ## What does this MR do? CustomEvent is not supported by IE.- https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent In order to stop using jQuery in new files that need to listen to custom events we need this polyfill. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7705
\| * \| \| \|	Adds polyfill for CustomEventcustom-event-polyfill	Filipa Lacerda	2016-11-23	1	-0/+12
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'zj-fix-flags-usage-gitlab-ci-yml' into 'master'	Rémy Coutable	2016-11-23	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix BASH usage in the .gitlab-ci.yml As discussed on Slack. Even though I created the fix, I was a mere code monkey in this case. See merge request !7693
\| * \| \| \|	Fix BASH usage in the .gitlab-ci.ymlzj-fix-flags-usage-gitlab-ci-yml	Z.J. van de Weg	2016-11-23	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'api-delete-group-share' into 'master'	Rémy Coutable	2016-11-23	4	-0/+66
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Add endpoint to delete a group share Closes #24771 See merge request !7662
\| * \| \| \| \|	API: Add endpoint to delete a group shareapi-delete-group-share	Robert Schilling	2016-11-23	4	-0/+66
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-13' into 'master'	Achilleas Pipinellis	2016-11-23	1	-3/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add details that Git LFS must be enabled in project ## What does this MR do? Add details that Git LFS must be enabled in project before it will work See merge request !7680
\| * \| \| \| \| \|	add details that Git LFS must be enabled in project	Ben Bodenmiller	2016-11-22	1	-3/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'grapify-sidekiq-metric-api' into 'master'	Rémy Coutable	2016-11-23	1	-32/+4
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the sidekiq metrics API Related to #22928 See merge request !7699
\| * \| \| \| \| \|	Grapify the sidekiq metrics API	Robert Schilling	2016-11-23	1	-32/+4
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'docs/chrome-support-requirements' into 'master'	Achilleas Pipinellis	2016-11-23	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support of Chrome/Chromium in requirements.md See merge request !7703
\| * \| \| \| \| \|	Add support of Chrome/Chromium in requirements.md	Achilleas Pipinellis	2016-11-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch '24863-mrs-without-discussions-are-mergeable' into 'master'	Sean McGivern	2016-11-23	3	-1/+63
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24863 See merge request !7698
\| * \| \| \| \| \| \|	Correctly determine mergeability of MR with no discussions24863-mrs-without-discussions-are-mergeable	Douwe Maan	2016-11-23	3	-1/+63
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'milestone_start_date' into 'master'	Sean McGivern	2016-11-23	27	-101/+205
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a starting date to milestones Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23704 See merge request !7484
\| * \| \| \| \| \| \| \|	Add a starting date to milestonesmilestone_start_date	Valery Sizov	2016-11-23	27	-101/+205
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'post_receive-any-email' into 'master'	Sean McGivern	2016-11-23	3	-2/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	post_receive: accept any user email from last commit See merge request !7225
\| * \| \| \| \| \| \| \|	update existing test	Elan Ruusamäe	2016-11-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	post_receive: accept any user email from last commit	Elan Ruusamäe	2016-11-04	2	-1/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/drop-project-authorized-for-user' into 'master'	Sean McGivern	2016-11-23	14	-185/+121
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use authorized projects in ProjectTeam Closes #23938 and #23636 See merge request !7586
\| * \| \| \| \| \| \| \| \|	Update ProjectTeam#fetch_members to use project authorizationsfix/drop-project-authorized-for-user	Ahmad Sherif	2016-11-23	5	-68/+32
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update ProjectTeam#max_member_access_for_user_ids to use project authorizations	Ahmad Sherif	2016-11-23	4	-49/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update user's authorized projects if project is allowed to share with group	Ahmad Sherif	2016-11-23	2	-1/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Drop Project#authorized_for_user? in favor of ProjectTeam#member?	Ahmad Sherif	2016-11-23	7	-65/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #23938
\| * \| \| \| \| \| \| \| \|	Refresh user's authorized projects when one of his memberships are updated	Ahmad Sherif	2016-11-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Change personal projects access level to master in ↵	Ahmad Sherif	2016-11-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	User#project_authorizations_union So that it matches the same access given in Projects::CreateService#after_create_actions
\| * \| \| \| \| \| \| \| \|	Use the minimum access level of group link and group member when inserting ↵	Ahmad Sherif	2016-11-23	1	-1/+1
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	authorized project records
* \| \| \| \| \| \| \| \|	Merge branch 'fix-ee_compat_check-when-branch-contains-a-slash' into 'master'	Rémy Coutable	2016-11-23	1	-2/+6
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure we sanitize branch names with path-unfriendly characters See merge request !7696
\| * \| \| \| \| \| \| \|	Ensure we sanitize branch names with path-unfriendly characters	Rémy Coutable	2016-11-23	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'remove-empty-describe-block' into 'master'	Rémy Coutable	2016-11-23	1	-3/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove empty describe block in service spec See merge request !7669
\| * \| \| \| \| \| \| \| \|	Remove empty describe block in service spec	Semyon Pupkov	2016-11-22	1	-3/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'zj-notify-development' into 'master'	Sean McGivern	2016-11-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notify broken master on #development See merge request !7593
\| * \| \| \| \| \| \| \| \| \|	Notify broken master on #development zj-notify-development	Zeger-Jan van de Weg	2016-11-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AKA: - move all conversations to #core - beating will continue until morale improves - Learn by pain - Pain driven development