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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Optimize creation of commit API by using Repository#commit instead of ↵sh-optimize-project-commit-api	Stan Hu	2017-07-03	1	-0/+4
\| \| \| \| \| \| \| \| \|	Repository#commits Repository#commits is expensive because it has to use Rugged to walk the Git tree as opposed to doing a direct ref lookup. Improves performance in #34533
*	Merge branch 'sh-allow-force-repo-create' into 'master'	Sean McGivern	2017-07-03	1	-0/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Make Project#ensure_repository force create a repo Closes gitlab-ee#2800 See merge request !12580
\| *	Make Project#ensure_repository force create a repo	Stan Hu	2017-06-30	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Geo, Project#ensure_repository is used to make sure that a Git repo is available to be fetched on a secondary. If a project were a fork, this directory would never be created. Closes gitlab-org/gitlab-ee#2800
* \|	Merge branch 'add-ci_variables-environment_scope' into 'master'	Kamil Trzciński	2017-07-03	1	-0/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add environment_scope column to ci_variables table See merge request !12363
\| * \	Merge remote-tracking branch 'upstream/master' into ↵add-ci_variables-environment_scope	Lin Jen-Shin	2017-07-04	22	-29/+64
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add-ci_variables-environment_scope * upstream/master: (79 commits) Reset @full_path to nil when cache expires add margin between captcha and register button Eagerly create a milestone that is used in a feature spec Adjust readme repo width Resolve "Issue Board -> "Remove from board" button when viewing an issue gives js error and fails" Fix rubocop offenses Make entrypoint and command keys to be array of strings Add issuable-list class to shared mr/issue lists to fix new responsive layout New navigation breadcrumbs Restore timeago translations in renderTimeago. Fix curl example paths (missing the 'files' segment) Automatically hide sidebar on smaller screens Fix typo in IssuesFinder comment Remove placeholder note when award emoji slash command is applied Make setSidebarHeight more efficient with SidebarHeightManager. Update CHANGELOG.md for 9.3.3 Resolve "More actions dropdown hidden by end of diff" Use Gitaly 0.14.0 Improve support for external issue references Make issuables_count_for_state public ...
\| * \| \|	Update changelog entry to reflect that we're renaming	Lin Jen-Shin	2017-06-29	1	-1/+1
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-06-29	26	-9/+99
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add-ci_variables-environment_scope * upstream/master: (192 commits) Minor edits Job details won't scroll horizontally to show long lines Bring back branches badge to main project page Inserts exact matches of username, email and name to the top of the user search list Limit OpenGraph image size to 64x64 Improve changelog Split up MergeRequestsController Add parent_id back to the tests Make changelog more descriptive Update README.md to reflect where "Secret variables" are located Improve tests text Rename members_count to members_count_with_descendants and expose only to group admins Fix a bug where an invalid sort param value was passed to Gitaly Drop default ORDER scope when calling a find method on a Sortable model Add tests for project import state transition: [:started] => [:finished] Add CHANGELOG Perform housekeeping only when an import of a fresh project is completed Strip trailing whitespace in relative submodule URL Adjust projects spec on namespace fields Add "members_count" and "parent_id" data on namespaces API ...
\| * \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-06-27	225	-818/+97
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add-ci_variables-environment_scope * upstream/master: (226 commits) Polish sidebar toggle Add changelog entry Fix optional args for POST :id/variables Update CHANGELOG.md for 9.3.1 Bump bootsnap to 1.1.1 Add explicit message when no runners on admin Fix endpoint not being update correctly Remove unused Gitlab::Git::Commit#to_diff argument Drop GFM support for the title of Milestone/MergeRequest in template Handle Promise rejections in mr_widget_pipeline_spec.js Handle missing pipeline in merge request widget Store merge request ref_fetched status in the database Tag a spec as :nested_groups since it fails on MySQL Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network retrieval of assets Truncate long job names in environment view; wrap author to next line Replaces 'dashboard/merge_requests' spinach with rspec Update GITLAB_SHELL_VERSION to 5.0.6 Fix click not being able to find the current element to use trigger('click') instead make accepting mrs more prominent Remove last references to job for pipeline charts ...
\| * \| \| \| \|	Add changelog entry	Lin Jen-Shin	2017-06-23	1	-0/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Grzegorz Bizon	2017-07-03	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'32885-unintentionally-removing-branch-when-merging-merge-request' into 'master' Set default for "Remove source branch" to false Closes #32885 See merge request !12576
\| * \| \| \| \| \|	Set force_remove_source_branch default to false.32885-unintentionally-removing-branch-when-merging-merge-request	Bryce Johnson	2017-07-02	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '32048-shared-runners-admin-buttons-have-odd-spacing' into 'master'	Clement Ho	2017-07-03	1	-0/+4
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Shared runners admin buttons have odd spacing" Closes #32048 See merge request !12535
\| * \| \| \| \| \|	Replace existing runner links with icons and tooltips, move into btn-group.32048-shared-runners-admin-buttons-have-odd-spacing	Bryce Johnson	2017-07-03	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-2801' into 'master'	Sean McGivern	2017-07-03	1	-0/+4
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expires full_path cache after a repository is renamed/transferred Closes gitlab-ee#2801 See merge request !12575
\| * \| \| \| \| \|	Add CHANGELOGfix-2801	Douglas Barbosa Alexandre	2017-06-29	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '23036-replace-dashboard-new-project-spinach' into 'master'	Rémy Coutable	2017-07-03	1	-0/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces 'dashboard/new-project.feature' spinach with rspec See merge request !12550
\| * \| \| \| \| \| \|	Replaces 'dashboard/new-project.feature' spinach with rspec	Alexander Randa	2017-06-29	1	-0/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '34116-milestone-filtering-on-group-issues' into 'master'	Sean McGivern	2017-07-03	1	-0/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use correct milestones for filtering on Group Issues Closes #34116 See merge request !12374
\| * \| \| \| \| \| \| \|	Change milestone endpoint for groups	Takuya Noguchi	2017-06-27	1	-0/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Resolve "Issue Board -> "Remove from board" button when viewing an issue ↵	Luke "Jared" Bennett	2017-07-03	1	-0/+4
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gives js error and fails"
* \| \| \| \| \| \| \|	Merge branch 'enable-webpack-code-splitting' into 'master'	Jacob Schatz	2017-06-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable webpack code splitting Closes #32989 See merge request !12032
\| * \| \| \| \| \| \| \|	add CHANGELOG.md entry for !12032	Mike Greiling	2017-06-29	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add issuable-list class to shared mr/issue lists to fix new responsive layoutfix-assigned-issuable-lists	tauriedavis	2017-06-30	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'speed-up-issue-counting-for-a-project' into 'master'	Rémy Coutable	2017-06-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up issue counting for a project Closes #33913 See merge request !12457
\| * \| \| \| \| \| \| \| \|	Fix typo in IssuesFinder comment	Sean McGivern	2017-06-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Add changelog entry for issue / MR tab counting optimisations	Sean McGivern	2017-06-30	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'adam-external-issue-references-spike' into 'master'	Sean McGivern	2017-06-30	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve support for external issue references Closes #33679, #34076, and #34082 See merge request !12485
\| * \| \| \| \| \| \| \| \| \|	Improve support for external issue referencesadam-external-issue-references-spike	Adam Niedzielski	2017-06-30	1	-0/+4
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.3.3	James Edwards-Jones	2017-06-30	6	-25/+0
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'dm-empty-state-new-merge-request' into 'master'	Sean McGivern	2017-06-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 'New merge request' button for users who don't have push access to canonical project See merge request !12560
\| * \| \| \| \| \| \| \| \|	Fix 'New merge request' button for users who don't have push access to ↵dm-empty-state-new-merge-request	Douwe Maan	2017-06-29	1	-0/+5
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	canonical project
* \| \| \| \| \| \| \| \|	Merge branch 'fix-sidebar-showing-mobile-merge-requests' into 'master'	Tim Zallmann	2017-06-30	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed sidebar not collapsing on merge request in mobile screens Closes #32759 See merge request !12489
\| * \| \| \| \| \| \| \|	Fixed sidebar not collapsing on merge request in mobile screens	Jose Ivan Vargas	2017-06-27	1	-0/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-project-destroy-in-namespace' into 'master'	Robert Speicher	2017-06-29	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Defer project destroys within a namespace in Groups::DestroyService#async_execute See merge request !12435
\| * \| \| \| \| \| \| \| \|	Defer project destroys within a namespace in ↵	Stan Hu	2017-06-29	1	-0/+4
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Groups::DestroyService#async_execute Group#destroy would actually hard-delete all associated projects even though the acts_as_paranoia gem is used, preventing Projects::DestroyService from doing any work. We first noticed this while trying to log all projects deletion to the Geo log.
* \| \| \| \| \| \| \| \|	Clean up issuable lists	Taurie Davis	2017-06-29	1	-0/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '33443_supplement_traditional_chinese_in_taiwan_translation' ↵	Douwe Maan	2017-06-29	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Supplement Traditional Chinese in Taiwan translation of Project Page & Repository Page Closes #33443 See merge request !12514
\| * \| \| \| \| \| \| \| \|	supplement traditional chinese in taiwan translation	黄涛	2017-06-29	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #33443
* \| \| \| \| \| \| \| \| \|	Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' ↵	Robert Speicher	2017-06-29	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Allow the feature flags to be enabled/disabled with more granularity Closes #34078 See merge request !12357
\| * \| \| \| \| \| \| \| \|	Add MR iid in CHANGELOG entry	Rémy Coutable	2017-06-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	Allow the feature flags to be enabled/disabled with more granularity	Rémy Coutable	2017-06-27	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows to enable/disable a feature flag for a given user, or a given Flipper group (must be declared statically in the `flipper.rb` initializer beforehand). Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Resolve "Issue dropdown persists when adding issue number to issue description"	Tim Zallmann	2017-06-29	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'revert-12499' into 'master'	Douwe Maan	2017-06-29	1	-4/+0
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'" Closes #34511 See merge request !12557
\| * \| \| \| \| \| \| \| \|	Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"	Adam Niedzielski	2017-06-29	1	-4/+0
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit b07c00032b038f40796a28e34b6dd4c622bad012, reversing changes made to 2b97d76d0b08a778710410df910a7601f6b8e9e7.
* \| \| \| \| \| \| \| \|	Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'	Kamil Trzciński	2017-06-29	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only count GL pipelines in usage data ping Closes #33172 See merge request !12277
\| * \| \| \| \| \| \| \|	Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelines	Z.J. van de Weg	2017-06-27	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When sending the usage data, it now includes all pipelines. This commit will split the pipelines in two; internal and external. This will lead to historical data being incorrectly marked this way. Fixes gitlab-org/gitlab-ce#33172
* \| \| \| \| \| \| \| \|	Merge branch '26125-match-username-on-search' into 'master'	Douwe Maan	2017-06-29	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Inserts exact matches of username and email to the top of the user search list Closes #26125 See merge request !12525
\| * \| \| \| \| \| \| \| \|	Inserts exact matches of username, email and name to the top of the user ↵26125-match-username-on-search	Tiago Botelho	2017-06-29	1	-0/+5
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	search list
* \| \| \| \| \| \| \| \|	Merge branch 'hb-fix-abuse-report-on-stale-user-profile' into 'master'	Douwe Maan	2017-06-29	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors caused by attempts to report already blocked or deleted users Closes #8928 See merge request !12502
\| * \| \| \| \| \| \| \| \|	Fix errors caused by attempts to report already blocked or deleted users	Horacio Bertorello	2017-06-28	1	-0/+4
\| \| \| \| \| \| \| \| \| \|