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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Handle creating a nested group on MySQL correctlybvl-fix-mysql-bare-repository-importer	Bob Van Landuyt	2017-08-25	1	-0/+4
\| \| \| \| \|	Since we don't support nested groups on MySQL, raise an error explaining that on import instead of trying anyway.
*	Merge branch '36937-fix-invite-by-email-text' into 'master'	Tim Zallmann	2017-08-25	1	-3/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix invite by email address duplication Closes #36937 See merge request !13826
\| *	Fix invite by email address duplication	Mark Fletcher	2017-08-25	1	-3/+4
\| \|
* \|	Merge branch 'zj-reword-job-to-pipeline-chart-view' into 'master'	Douwe Maan	2017-08-25	1	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reword job to pipeline on the chart view Closes #36928 See merge request !13786
\| * \|	Reword job to pipeline on the chart view	Zeger-Jan van de Weg	2017-08-24	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This got changed for i18n in !12480, however, I forgot to understand that the meaning of the graphs changed in !12378. This corrects the behaviour.
* \| \|	Revert "Merge branch 'sh-sidekiq-backtrace' into 'master'"	Robert Speicher	2017-08-25	6	-13/+0
\| \| \| \| \| \| \| \| \|	This reverts merge request !13813
* \| \|	Enable 5 lines of Sidekiq backtrace lines to aid in debugging	Stan Hu	2017-08-24	6	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Customers often have Sidekiq jobs that failed without much context. Without Sentry, there's no way to tell where these exceptions were hit. Adding in additional lines adds a bit more Redis storage overhead. This commit adds in backtrace logging for workers that delete groups/projects and import/export projects. Closes #27626
* \| \|	Merge branch 'bvl-alternative-fix-ldap-login' into 'master'docs-36116-install-gitlab-on-azure	Douwe Maan	2017-08-24	2	-8/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Alternative fix for 422 when using standard login with ldap enabled See merge request !13103
\| * \| \|	Define ldap methods at runtime	Bob Van Landuyt	2017-08-24	2	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This avoids loading the `OmniAuthCallbacksController` at boot time so it doesn't mess up the `before_action`-chain
* \| \| \|	Merge branch '36589-hide-group-name-on-collapse' into 'master'	Clement Ho	2017-08-24	5	-7/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide group title on sidebar collapse; use more generic class for titles Closes #36589 See merge request !13777
\| * \| \| \|	Hide group title on sidebar collapse; use more generic class for titles36589-hide-group-name-on-collapse	Annabel Dunstone Gray	2017-08-23	5	-7/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'git-operation-user' into 'master'	Sean McGivern	2017-08-24	10	-46/+16
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move GitHooksService into Gitlab::Git See merge request !13739
\| * \| \| \|	Avoid committer = linesgit-operation-user	Jacob Vosmaer	2017-08-24	2	-21/+11
\| \| \| \| \|
\| * \| \| \|	Move GitHooksService to Gitlab::Git	Jacob Vosmaer	2017-08-23	9	-40/+8
\| \| \| \| \|
\| * \| \| \|	Make gl_repository a G::G::Repository attribute	Jacob Vosmaer	2017-08-23	3	-6/+6
\| \| \| \| \|
\| * \| \| \|	Decouple GitOperationService from User	Jacob Vosmaer	2017-08-23	3	-16/+28
\| \| \| \| \|
* \| \| \| \|	Changed all font-weight values to 400 and 600	Dimitrie Hoekstra	2017-08-24	63	-178/+180
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Kamil Trzciński	2017-08-24	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix/sm/36731-improve-spec-spec-features-runners_spec-rb-and-spec-features-admin-admin_runners_spec-rb' into 'master' Reorganizes spec: spec/features/runners_spec.rb Closes #36731 See merge request !13716
\| * \| \| \| \|	Refurbish spec/features/runners_spec.rb	Shinya Maeda	2017-08-23	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge branch 'backstage/gb/after-save-asynchronous-job-hooks' into 'master'	Kamil Trzciński	2017-08-24	1	-1/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not fire synchronous hooks when creating a job Closes #35286 See merge request !13734
\| * \ \ \ \	Merge branch 'master' into backstage/gb/after-save-asynchronous-job-hooks	Grzegorz Bizon	2017-08-23	37	-155/+418
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (115 commits) Use event-based waiting in Gitlab::JobWaiter Make sure repository's removal work for legacy and hashed storages Use `@hashed` prefix for hashed paths on disk, to avoid collision with existing ones Refactor project and storage types Prevent using gitlab import task when hashed storage is enabled Some codestyle changes and fixes for GitLab pages Removed some useless code, codestyle changes and removed an index Fix repository reloading in some specs Changelog Moving away from the "extend" based factory to a more traditional one. Enable automatic hashed storage for new projects by application settings New storage is now "Hashed" instead of "UUID" Add UUID Storage to Project Move create_repository back to project model as we can use disk_path and share it Codestyle: move hooks to the same place and move dependent methods to private Use non-i18n values for setting new group-level issue/MR button text indexes external issue tracker copyedit indexes user/search/ from /user/index Correctly encode string params for Gitaly's TreeEntries RPC ...
\| * \| \| \| \| \|	Run job hooks after transation commits after create	Grzegorz Bizon	2017-08-23	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Do not fire synrchonous hooks when creating a job	Grzegorz Bizon	2017-08-22	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fire asynchronous hooks instead.
* \| \| \| \| \| \|	Merge branch 'thenable-ajax-api-calls' into 'master'	Fatih Acet	2017-08-24	3	-15/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thenable ajax api calls See merge request !13427
\| * \| \| \| \| \| \|	Added repo_service_spec for commitFlash and corrected repo_commit-Secion api ↵thenable-ajax-api-calls	Luke "Jared" Bennett	2017-08-23	1	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec
\| * \| \| \| \| \| \|	fix eslint violations in repo editor files	Mike Greiling	2017-08-17	3	-10/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add thenable ajax calls.	Jacob Schatz	2017-08-17	3	-9/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'archived-projects-only' into 'master'	Douwe Maan	2017-08-24	5	-31/+78
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an option to list only archived projects Closes #35994 See merge request !13492
\| * \| \| \| \| \| \| \|	Add an option to list only archived projects	Mehdi Lahmam	2017-08-24	4	-6/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35994
\| * \| \| \| \| \| \| \|	Refactor Admin::ProjectsFinder by extracting finders as private methods	Mehdi Lahmam	2017-08-24	2	-26/+54
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Delegate Repository::branch_exists? and ref_exists? to Gitlab::Git	Andrew Newdigate	2017-08-24	1	-3/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '36262_merge_request_reference_in_merge_commit_global' into ↵	Sean McGivern	2017-08-24	1	-2/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' fix Merge request reference in merge commit is not global Closes #36262 See merge request !13518
\| * \| \| \| \| \| \| \|	[ci skip] changelog entry added for full merge request ref changes	haseeb	2017-08-23	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix Merge request reference in merge commit is not global	haseeb	2017-08-13	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'zj-add-pipeline-source-variable' into 'master'	Grzegorz Bizon	2017-08-24	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose CI_PIPELINE_SOURCE on CI jobs Closes #34165 See merge request !13759
\| * \| \| \| \| \| \| \|	Expose CI_PIPELINE_SOURCE on CI jobs	Zeger-Jan van de Weg	2017-08-23	1	-1/+2
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was missing and expected it wouldn't hurt anyone
* \| \| \| \| \| \| \|	Merge branch 'use_full_path_in_project_avatar_url_webhook' into 'master'	Robert Speicher	2017-08-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use full path of project's avatar in webhooks Closes #36539 See merge request !13649
\| * \| \| \| \| \| \| \|	Use full path of project's avatar in webhooks	blackst0ne	2017-08-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '36709-gpg-status' into 'master'	Clement Ho	2017-08-23	3	-6/+7
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix alignment of gpg status Closes #36709 See merge request !13772
\| * \| \| \| \| \| \| \|	Fix alignment of gpg status36709-gpg-status	Annabel Dunstone Gray	2017-08-23	3	-6/+7
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'zj-fix-fe-blank-button' into 'master'	Clement Ho	2017-08-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix blank button not resetting project template value Closes #36816 See merge request !13757
\| * \| \| \| \| \| \| \|	Fix blank button not resetting project template value	Zeger-Jan van de Weg	2017-08-23	1	-1/+1
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The button didn't override a value, so the old value was posted again.
* \| \| \| \| \| \| \|	Merge branch 'cache-issue-and-mr-counts' into 'master'	Douwe Maan	2017-08-23	12	-28/+109
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache the number of open issues and merge requests Closes #36622 See merge request !13639
\| * \| \| \| \| \| \| \|	Cache the number of open issues and merge requests	Yorick Peterse	2017-08-23	12	-28/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Every project page displays a navigation menu that in turn displays the number of open issues and merge requests. This means that for every project page we run two COUNT() queries, each taking up roughly 30 milliseconds on GitLab.com. By caching these numbers and refreshing them whenever necessary we can reduce loading times of all these pages by up to roughly 60 milliseconds. The number of open issues does not include confidential issues. This is a trade-off to keep the code simple and to ensure refreshing the data only needs 2 COUNT() queries instead of 3. A downside is that if a project only has 5 confidential issues the counter will be set to 0. Because we now have 3 similar counting service classes the code previously used in Projects::ForksCountService has mostly been moved to Projects::CountService, which in turn is reused by the various service classes. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36622
* \| \| \| \| \| \| \| \|	Merge branch 'bvl-improve-bare-project-import' into 'master'	Sean McGivern	2017-08-23	1	-0/+45
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the import take subgroups into account Closes #36664 and #30546 See merge request !13670
\| * \| \| \| \| \| \| \|	Migrate creation of nested groups into a service	Bob Van Landuyt	2017-08-23	1	-0/+45
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'remove-tooltip-filtered-search-user' into 'master'	Tim Zallmann	2017-08-23	2	-3/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-3/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-push-events-branch-removals' into 'master'	Sean McGivern	2017-08-23	4	-11/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-11/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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