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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix racing condition in Ajax call of merge_request_tabs_spec.jswinh-fix-transient-loadDiff-failure	Winnie Hellmann	2017-12-20	1	-5/+9
\|
*	Merge branch 'zj-empty-repo-importer' into 'master'	Stan Hu	2017-12-20	3	-5/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Migrate to Project#empty_repo? Closes #41326 See merge request gitlab-org/gitlab-ce!16054
\| *	Migrate to Project#empty_repo?zj-empty-repo-importer	Zeger-Jan van de Weg	2017-12-20	3	-5/+10
\|/
*	Merge branch 'layout-nav-es-module' into 'master'	Filipa Lacerda	2017-12-20	2	-42/+33
\|\ \| \| \| \| \| \| \| \|	Changed layout_nav to ES module See merge request gitlab-org/gitlab-ce!16003
\| *	Merge branch 'master' into layout-nav-es-modulelayout-nav-es-module	Filipa Lacerda	2017-12-20	61	-212/+594
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (21 commits) Prevent some specs from mangling the gitlab-shell checkout Line up search dropdown with other nav dropdowns Fix onion-skin re-entering state Remove related links in MR widget when empty state Show inline edit button for issues Fix tags in the Activity tab not being clickable Fix shortcut links on help page Don't link LFS-objects multiple times. [CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rb Tidy up the documentation of Gitlab HA/Gitlab Application Make sure two except won't overwrite each other Update axios.md Remove transitionend event from GL dropdown Preserve gem path so that we use the same gems Load commit in batches for pipelines#index BlobViewer::PackageJson - if private link to homepage Do not generate links for private NPM modules in blob view Remove block styling from search dropdown Fix sidebar height when performance bar enabled Remove all dropdown animations and set display: none if they're not open ...
\| * \|	Changed layout_nav to ES module	Phil Hughes	2017-12-19	2	-42/+33
\| \| \|
* \| \|	Merge branch '38318-search-merge-requests-with-api' into 'master'	Rémy Coutable	2017-12-20	5	-2/+30
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Search merge-requests with API" Closes #38318 See merge request gitlab-org/gitlab-ce!16029
\| * \| \|	Add optional `search` param for Merge Requests API	Mark Fletcher	2017-12-20	4	-0/+28
\| \| \| \|
\| * \| \|	Employ declared_params in finder methods for MR and Issue API lists	Mark Fletcher	2017-12-20	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Ensure that unwanted params are no passed to actual finder classes
* \| \| \|	Merge branch 'docs-qa-extend-how-to-run-specific-test' into 'master'	Grzegorz Bizon	2017-12-20	1	-1/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specify how we're utilizing rspec for bin/qa See merge request gitlab-org/gitlab-ce!16040
\| * \| \| \|	Specify how we're utilizing rspec heredocs-qa-extend-how-to-run-specific-test	Lin Jen-Shin	2017-12-20	1	-1/+8
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch ↵	Douwe Maan	2017-12-20	8	-67/+95
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhausted' into 'master' Fork and Import jobs only get marked as failed when the number of Sidekiq retries were exhausted Closes #39246 See merge request gitlab-org/gitlab-ce!15844
\| * \| \| \|	Fork and Import jobs only get marked as failed when the number of Sidekiq ↵39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhausted	Tiago Botelho	2017-12-15	8	-67/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	retries were exhausted
* \| \| \| \|	Merge branch 'rs-blocks-json-serialization' into 'master'	Douwe Maan	2017-12-20	20	-32/+66
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add BlocksJsonSerialization model concern and include it in User Closes #37947 See merge request gitlab-org/gitlab-ce!14350
\| * \| \| \|	Call the correct method in the BlocksJsonSerialization specrs-blocks-json-serialization	Robert Speicher	2017-12-19	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Only include the user's ID in the time_spent command's update hash	Robert Speicher	2017-12-19	11	-25/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, this would include the entire User record in the update hash, which was rendered in the response using `to_json`, erroneously exposing every attribute of that record, including their (now removed) private token. Now we only include the user ID, and perform the lookup on-demand.
\| * \| \| \|	Add a JsonSerializationError class instead of raising SecurityError	Robert Speicher	2017-12-19	2	-4/+6
\| \| \| \| \|
\| * \| \| \|	Use UserSerializer instead of `User.to_json`	Robert Speicher	2017-12-19	5	-7/+6
\| \| \| \| \|
\| * \| \| \|	Accept arguments to blocked JSON serialization methods	Robert Speicher	2017-12-19	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add BlocksJsonSerialization model concern and include it in User	Robert Speicher	2017-12-19	4	-0/+33
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch '41186-sidebar-too-much-vertical-scroll' into 'master'	Phil Hughes	2017-12-20	6	-55/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove animations from dropdowns Closes #41186 See merge request gitlab-org/gitlab-ce!15968
\| * \| \| \|	Line up search dropdown with other nav dropdowns41186-sidebar-too-much-vertical-scroll	Annabel Dunstone Gray	2017-12-19	2	-8/+5
\| \| \| \| \|
\| * \| \| \|	Remove transitionend event from GL dropdown	Phil Hughes	2017-12-19	1	-16/+8
\| \| \| \| \|
\| * \| \| \|	Remove block styling from search dropdown	Annabel Dunstone Gray	2017-12-18	1	-7/+0
\| \| \| \| \|
\| * \| \| \|	Fix sidebar height when performance bar enabled	Annabel Dunstone Gray	2017-12-18	2	-0/+6
\| \| \| \| \|
\| * \| \| \|	Remove all dropdown animations and set display: none if they're not open	Annabel Dunstone Gray	2017-12-18	2	-14/+2
\| \| \| \| \|
\| * \| \| \|	Remove extra height declarations in CSS; remove block styling from dropdowns	Annabel Dunstone Gray	2017-12-18	4	-15/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'bvl-fix-unlinking-with-lfs-objects' into 'master'	Douwe Maan	2017-12-20	3	-1/+27
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't link LFS-objects multiple times. Closes #41241 See merge request gitlab-org/gitlab-ce!16006
\| * \| \| \|	Don't link LFS-objects multiple times.bvl-fix-unlinking-with-lfs-objects	Bob Van Landuyt	2017-12-19	3	-1/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If Unlinking a fork would fail somewhere after this, the LFS objects might still be linked. Which would cause issues when trying to destroy a project.
* \| \| \| \|	Merge branch '41264-gitlab-projects-spec-failures' into 'master'	Robert Speicher	2017-12-19	3	-10/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spec failures in spec/lib/gitlab/git/gitlab_projects_spec.rb Closes #41264 See merge request gitlab-org/gitlab-ce!16015
\| * \| \| \| \|	Prevent some specs from mangling the gitlab-shell checkout	Nick Thomas	2017-12-19	2	-8/+5
\| \| \| \| \| \|
\| * \| \| \| \|	[CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rb	Valery Sizov	2017-12-19	1	-2/+4
\| \|/ / / /
* \| \| \| \|	Merge branch 'fix-onion-skin-reenter' into 'master'	Jacob Schatz	2017-12-19	3	-13/+35
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix onion-skin re-entering state Closes #38533 See merge request gitlab-org/gitlab-ce!15815
\| * \| \| \| \|	Fix onion-skin re-entering state	Clement Ho	2017-12-19	3	-13/+35
\|/ / / / /
* \| \| \| \|	Merge branch 'remove-links-mr-empty-state' into 'master'	Jacob Schatz	2017-12-19	7	-14/+84
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove related links in MR widget when empty state Closes #36764 See merge request gitlab-org/gitlab-ce!15888
\| * \| \| \| \|	Remove related links in MR widget when empty state	Clement Ho	2017-12-19	7	-14/+84
\|/ / / / /
* \| \| \| \|	Merge branch 'show-inline-edit-btn' into 'master'	Jacob Schatz	2017-12-19	7	-21/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show inline edit button for issues Closes #37474 See merge request gitlab-org/gitlab-ce!15812
\| * \| \| \| \|	Show inline edit button for issues	Clement Ho	2017-12-19	7	-21/+10
\|/ / / / /
* \| \| \| \|	Merge branch '33028-event-tag-links' into 'master'	Rémy Coutable	2017-12-19	3	-1/+62
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tags in the Activity tab not being clickable Closes #33028 See merge request gitlab-org/gitlab-ce!15996
\| * \| \| \| \|	Fix tags in the Activity tab not being clickable	Mario de la Ossa	2017-12-19	3	-1/+62
\|/ / / / /
* \| \| \| \|	Merge branch '36020-private-npm-modules' into 'master'	Douwe Maan	2017-12-19	5	-4/+81
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not generate links for private NPM modules in blob view Closes #36020 See merge request gitlab-org/gitlab-ce!16002
\| * \| \| \| \|	BlobViewer::PackageJson - if private link to homepage	Mario de la Ossa	2017-12-18	3	-7/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Do not generate links for private NPM modules in blob view	Mario de la Ossa	2017-12-18	5	-4/+74
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'zj-gitaly-pipelines-n-1' into 'master'	Robert Speicher	2017-12-19	14	-49/+184
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of Pipelines#index.json See merge request gitlab-org/gitlab-ce!14846
\| * \| \| \| \| \|	Load commit in batches for pipelines#index	Zeger-Jan van de Weg	2017-12-19	14	-49/+184
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses `list_commits_by_oid` on the CommitService, to request the needed commits for pipelines. These commits are needed to display the user that created the commit and the commit title. This includes fixes for tests failing that depended on the commit being `nil`. However, now these are batch loaded, this doesn't happen anymore and the commits are an instance of BatchLoader.
* \| \| \| \| \| \|	Merge branch 'fix-docs-help-shortcut' into 'master'	Phil Hughes	2017-12-19	6	-4/+53
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix shortcut links on help page Closes #41097 See merge request gitlab-org/gitlab-ce!16001
\| * \| \| \| \| \| \|	Fix shortcut links on help page	Clement Ho	2017-12-19	6	-4/+53
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fl-update-axios-docs' into 'master'	Phil Hughes	2017-12-19	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update axios.md See merge request gitlab-org/gitlab-ce!16008
\| * \ \ \ \ \ \	Merge branch 'master' into fl-update-axios-docs	Filipa Lacerda	2017-12-19	2	-38/+29
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Tidy up the documentation of Gitlab HA/Gitlab Application Make sure two except won't overwrite each other
\| * \| \| \| \| \| \| \|	Update axios.mdfl-update-axios-docs	Filipa Lacerda	2017-12-19	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|