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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Adjust a range and a size in stages statuses migrationbackstage/gb/improve-stages-statuses-migration	Grzegorz Bizon	2017-08-23	2	-7/+8
\|
*	Merge branch 'gitaly-commit-patch' into 'master'	Sean McGivern	2017-08-23	5	-4/+45
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Incorporate DiffService.CommitPatch Gitaly RPC Closes gitaly#463 See merge request !13441
\| *	Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patch	Alejandro Rodríguez	2017-08-22	6	-5/+46
\| \|
* \|	Merge branch 'remove-tooltip-filtered-search-user' into 'master'	Tim Zallmann	2017-08-23	3	-9/+46
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove tooltip from filtered search user Closes #36696 See merge request !13752
\| * \|	Remove tooltip from filtered search userremove-tooltip-filtered-search-user	Clement Ho	2017-08-22	3	-9/+46
\| \| \|
* \| \|	Merge branch 'fix-push-events-branch-removals' into 'master'	Sean McGivern	2017-08-23	7	-11/+62
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix displaying events of removed events and events without commit messages Closes #36685 and #36722 See merge request !13721
\| * \| \|	Fix display of push events for removed refsfix-push-events-branch-removals	Yorick Peterse	2017-08-22	7	-11/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes the style of push events that remove tags or branches so they don't display the commit details. This prevents displaying commit details such as: 000000 . --broken encoding Instead we now simply display the header such as: Administrator deleted branch example-branch This is displayed in the same style as events for newly created branches/tags. This commit also ensures that if no commit message is present we simply don't display anything, instead of "--broken encoding". Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36685 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36722
* \| \| \|	Merge branch 'tc-remove-nonexisting-namespace-pending-delete-projects' into ↵	Douwe Maan	2017-08-23	5	-1/+107
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add migration to remove pending delete projects with non-existing namespace Closes #36541 See merge request !13598
\| * \| \| \|	Use EachBatch concern to loop over batchestc-remove-nonexisting-namespace-pending-delete-projects	Toon Claes	2017-08-22	2	-26/+22
\| \| \| \| \|
\| * \| \| \|	Migration to remove pending delete projects with non-existing namespace	Toon Claes	2017-08-22	5	-1/+111
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There might be some projects where the namespace was removed, but the project wasn't. For these the projects still have a `namespace_id` set. So this adds a post-deploy migration remove all projects that are pending delete, and have a `namespace_id` that is non-existing.
* \| \| \| \|	Merge branch 'rs-fix-admin-logs-timeout' into 'master'	Douwe Maan	2017-08-23	3	-16/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a potential timeout in `Gitlab::Logger.read_latest` See merge request !13751
\| * \| \| \| \|	Refactor `Admin::LogsController#show`rs-fix-admin-logs-timeout	Robert Speicher	2017-08-22	2	-10/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We should be defining the list of loggers in the controller, not the view.
\| * \| \| \| \|	Fix a potential timeout in `Gitlab::Logger.read_latest`	Robert Speicher	2017-08-22	1	-6/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If this method was called for a file that didn't exist, we attempted to first `build` it. But if the file wasn't writeable, such as a symlink pointing to an unmounted filesystem, the method would just hang and eventually timeout. Further, this was entirely pointless since we were creating a file and then shelling out to `tail`, eventually returning an empty Array. Now we just skip building it and return the empty Array straight away.
* \| \| \| \| \|	Merge branch 'rs-stub-storage-availability-check' into 'master'	Douwe Maan	2017-08-23	2	-1/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stub `ForkedStorageCheck.storage_available?` by default in all specs See merge request !13726
\| * \| \| \| \| \|	Stub `ForkedStorageCheck.storage_available?` by default in all specsrs-stub-storage-availability-check	Robert Speicher	2017-08-22	2	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `:broken_storage` metadata to examples to disable this behavior only when necessary.
* \| \| \| \| \| \|	Merge branch 'fix-broken-testing-of-some-integrations' into 'master'	Douwe Maan	2017-08-23	3	-16/+40
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inability to test some project integrations Closes gitlab-ee#3194 See merge request !13729
\| * \| \| \| \| \| \|	Fix inability to test some project integrationsfix-broken-testing-of-some-integrations	Rubén Dávila	2017-08-22	3	-16/+40
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'disable-webpack-optimization' into 'master'	Tim Zallmann	2017-08-23	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable webpack.optimize because it's breaking karma in EE See merge request !13720
\| * \| \| \| \| \| \| \|	disable webpack.optimize.ModuleConcatenationPlugin during karma testsdisable-webpack-optimization	Mike Greiling	2017-08-21	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '33503-new-icons-for-system-notes' into 'master'	Clement Ho	2017-08-23	16	-18/+29
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement new system note icons Closes #33503 See merge request !13673
\| * \| \| \| \| \| \| \| \|	Implement new system note icons	Bryce Johnson	2017-08-23	16	-18/+29
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fix-group-policy-specs-on-mysql' into 'master'	Robert Speicher	2017-08-22	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes group policy specs on MySQL. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/36810 See merge request !13747
\| * \| \| \| \| \| \| \| \|	Fixes group policy specs on MySQL.fix-group-policy-specs-on-mysql	Tiago Botelho	2017-08-22	1	-0/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-fix-master' into 'master'	Stan Hu	2017-08-22	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `:nested_groups` metadata to two subgroup-related specs Closes #36811 and #36812 See merge request !13746
\| * \| \| \| \| \| \| \| \|	Add `:nested_groups` metadata to two subgroup-related specs	Robert Speicher	2017-08-22	2	-2/+2
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevents these from failing on MySQL. Closes #36811 and #36812.
* \| \| \| \| \| \| \| \|	Merge branch '36779-update-kubernetes-install-docs' into 'master'	Marcia Ramos	2017-08-22	4	-3/+28
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Kubernetes install docs Closes #36779 See merge request !13730
\| * \| \| \| \| \| \| \| \|	Apply feedback	Joshua Lambert	2017-08-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix spacing with code block36779-update-kubernetes-install-docs	Joshua Lambert	2017-08-22	3	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add link to cloud native charts, add helm init info	Joshua Lambert	2017-08-22	4	-3/+23
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '36496-badges-should-not-be-huge' into 'master'	Clement Ho	2017-08-22	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Badges should not be HUGE" Closes #36496 See merge request !13635
\| * \| \| \| \| \| \| \| \|	Sometimes you don't see the forrest because of all the trees, set now the ↵36496-badges-should-not-be-huge	Tim Zallmann	2017-08-18	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	preloading sizes to specific lazy class
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-monaco-loader-test' into 'master'	Jacob Schatz	2017-08-22	4	-13/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix monaco loader test See merge request !13682
\| * \| \| \| \| \| \| \| \| \|	add global __webpack_public_path__ to eslint configupdate-monaco-loader-test	Mike Greiling	2017-08-18	4	-7/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fix monaco loader test to not break with statically analyzed import statements	Mike Greiling	2017-08-18	1	-7/+5
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-merge-request-diff-nav' into 'master'	Marcia Ramos	2017-08-22	2	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs merge request diff nav See merge request !13743
\| * \| \| \| \| \| \| \| \|	img/merge_request_diff_file_navigation.png	Victor Wu	2017-08-22	1	-0/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge request diff file navigation	Victor Wu	2017-08-22	1	-0/+8
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'git-gc-raise-lease-timeotu' into 'master'	Sean McGivern	2017-08-22	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise Git GC (Housekeeping) Lease Timeout to 24h See merge request !13719
\| * \| \| \| \| \| \| \| \|	Raise GC Lease Timeout to 24hgit-gc-raise-lease-timeotu	Kim "BKC" Carlbäcker	2017-08-22	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/sm/34762-bad-validation-message' into 'master'	Kamil Trzciński	2017-08-22	3	-2/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enforce namespace of Kubernetes to lowercase Closes #34762 See merge request !13732
\| * \| \| \| \| \| \| \| \|	Update kubernetes_service_spec.rbfix/sm/34762-bad-validation-message	Shinya Maeda	2017-08-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Enfouce namespace for Kubernetes to lowercase	Shinya Maeda	2017-08-22	3	-2/+10
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '36721-rename-repo-text' into 'master'	Annabel Dunstone Gray	2017-08-22	1	-2/+0
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	36721 Remove incorrect paragraph regarding renaming repos in settings Closes #36721 See merge request !13718
\| * \| \| \| \| \| \| \|	36721 Remove incorrect paragraph regarding renaming repos in settings36721-rename-repo-text	tauriedavis	2017-08-21	1	-2/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'zj-fix-import-gitlab-export-form' into 'master'	Douwe Maan	2017-08-22	3	-40/+49
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update form to properly set the path Closes #36519 See merge request !13722
\| * \| \| \| \| \| \| \|	Update form to properly set the path	Zeger-Jan van de Weg	2017-08-22	3	-40/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also includes a change in allowing uploaded files, as there was a mismatch in object_id between classes, disallowing params[:file], which is a UploadedFile, newly loaded. The params checked against the older version. Fixes gitlab-org/gitlab-ce#36519
* \| \| \| \| \| \| \| \|	Merge branch 'fix/import-fork-mr' into 'master'	Sean McGivern	2017-08-22	6	-2/+29
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Import/Export issue to do with fork merge requests Closes #36666 See merge request !13717
\| * \| \| \| \| \| \| \|	fix static analysisfix/import-fork-mr	James Lopez	2017-08-22	1	-2/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix specs	James Lopez	2017-08-22	1	-1/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	add changelog	James Lopez	2017-08-21	1	-0/+5
\| \| \| \| \| \| \| \| \|