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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Only update the sidebar count caches when neededsidebar-cache-updates	Yorick Peterse	2017-08-30	2	-0/+12
\| \| \| \| \| \|	This ensures the issues/MR cache of the sidebar is only updated when the state or confidential flags changes, instead of changing this for every update.
*	Merge branch '37069-remove-li' into 'master'	Phil Hughes	2017-08-29	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary divider Closes #37069 See merge request !13841
\| *	Remove unnecessary divider37069-remove-li	Annabel Dunstone Gray	2017-08-25	1	-1/+1
\| \|
* \|	Merge branch '37102-fix-prometheus-graph-cursor-flag' into 'master'	Phil Hughes	2017-08-29	1	-8/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure Prometheus graph overlay is in front of cursor flag Closes #37102 See merge request !13867
\| * \|	ensure graph overlay is in front of cursor flag37102-fix-prometheus-graph-cursor-flag	Mike Greiling	2017-08-28	1	-8/+8
\| \| \|
* \| \|	Resolve "Monitoring graph date formatting is wrong"	Mike Greiling	2017-08-29	5	-15/+22
\| \| \|
* \| \|	Merge branch '36114-stuck-mrs-job-follow-up' into 'master'	Sean McGivern	2017-08-29	6	-10/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Present enqueued merge jobs as "Merging" as well (https://gitlab.com/gitlab-org/gitlab-ce/issues/31207 follow-up) Closes #36114 See merge request !13483
\| * \| \|	Cleans merge_jid when possible on MergeService36114-stuck-mrs-job-follow-up	Oswaldo Ferreira	2017-08-28	1	-3/+6
\| \| \| \|
\| * \| \|	Rename MergeRequest#async_merge to merge_async	Oswaldo Ferreira	2017-08-28	4	-5/+5
\| \| \| \|
\| * \| \|	Add changelog	Oswaldo Ferreira	2017-08-28	1	-1/+1
\| \| \| \|
\| * \| \|	Track enqueued and ongoing MRs	Oswaldo Ferreira	2017-08-28	6	-9/+16
\| \| \| \|
\| * \| \|	Remove locked? check when unlocking a merge request	Oswaldo Ferreira	2017-08-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Our state machine shall have enough knowledge to not allow states other than locked from transitioning to opened (e.g. MergeRequest#unlock_mr).
* \| \| \|	Add styles for shorter code	Jacob Schatz	2017-08-29	1	-0/+24
\| \| \| \|
* \| \| \|	Merge branch '34413-move-convdev-index-location-to-after-cohorts' into 'master'	Phil Hughes	2017-08-29	3	-8/+8
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move ConvDev Index location to after Cohorts Closes #34413 See merge request !13398
\| * \| \|	Move ConvDev index to Overview from Monitoring.34413-move-convdev-index-location-to-after-cohorts	Bryce Johnson	2017-08-18	3	-8/+8
\| \| \| \|
* \| \| \|	Merge branch '36582-fix-note-resolved-icon' into 'master'evn-fix-formatting-of-cla	Fatih Acet	2017-08-28	5	-6/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update and fix resolvable note icons for easier recognition Closes #36582 See merge request !13821
\| * \| \| \|	Update and fix resolvable note icons for easier recognition36582-fix-note-resolved-icon	Eric Eastwood	2017-08-25	5	-6/+20
\| \| \| \| \|
* \| \| \| \|	Merge branch 'group-mr-search-bar' into 'master'	Clement Ho	2017-08-28	2	-3/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add filtered search to group merge requests dashboard Closes #36703 See merge request !13688
\| * \| \| \| \|	Add filtered search to group merge requests dashboard	Hiroyuki Sato	2017-08-19	2	-3/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '36792-inline-user-refresh-when-creating-project' into 'master'	Douwe Maan	2017-08-28	4	-10/+43
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't wait for project authorization sidekiq jobs when creating projects Closes #36792 See merge request !13775
\| * \| \| \| \| \|	Don't treat gitlab project imports specially in Projects::CreateService	Nick Thomas	2017-08-25	1	-4/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Don't add admins as masters to projects created in another user's namespace	Nick Thomas	2017-08-25	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only admins have the ability to create a project in another user's personal namespace. Prior to this commit, we were explicitly adding them as masters to the project. However, admins already have access (by virture of being admins), so this is unnecessary.
\| * \| \| \| \| \|	Move sidekiq-based project authorization refresh out of Projects::CreateService	Nick Thomas	2017-08-25	4	-8/+44
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the project is in a group, the `group.refresh_members_authorized_projects` is made non-blocking, and we call `current_user.refresh_authorized_projects` directly. Projects in a personal namespace are more difficult. Rather than passing the `blocking:` parameter through the entire `add_master` chain, have the `AuthorizedProjectsWorker` automatically inline authorizations for three IDs or less. Since the maximum number of IDs in this path is 2, that has the same effect.
* \| \| \| \| \|	Merge branch 'sh-simplify-system-hook-testing' into 'master'	Douwe Maan	2017-08-28	1	-34/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify system hook testing and guarantee test will fire Closes #37067 See merge request !13858
\| * \| \| \| \| \|	Simplify system hook testing and guarantee test will firesh-simplify-system-hook-testing	Stan Hu	2017-08-27	1	-34/+3
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The change in !11728 would cause an arbitrary project to be chosen to test system hooks, and it's likely that the project would not have any commits or relevant commits to test the hook. This would prevent admins from verifying that the hook fired. Instead of trying to create a representative hook dynamically, just send static data to guarantee the hook will actually be tested. Closes #37067
* \| \| \| \| \|	Merge branch 'bugfix.notify-custom-participants' into 'master'	Sean McGivern	2017-08-28	2	-28/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bugfix.notify custom participants Closes #36610 See merge request !13680
\| * \| \| \| \| \|	don't rely on order of notification levels	http://jneen.net/	2017-08-21	1	-27/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	factor out #suitable_notification_level? and check manually by notification level. this makes the notification logic clear and actually reflect what is in the documentation as to what should happen with each setting.
\| * \| \| \| \| \|	actually use the :participating notification type	http://jneen.net/	2017-08-21	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'backstage/gb/rename-ci-cd-processing-sidekiq-queues' into 'master'	Grzegorz Bizon	2017-08-28	14	-15/+39
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename CI/CD related Sidekiq queues Closes #35532 See merge request !13714
\| * \ \ \ \ \ \	Merge commit '2be34630623711fc20ef8c101b5cef688f207cc1' into ↵backstage/gb/rename-ci-cd-processing-sidekiq-queues	Grzegorz Bizon	2017-08-26	16	-62/+131
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	backstage/gb/rename-ci-cd-processing-sidekiq-queues * commit '2be34630623711fc20ef8c101b5cef688f207cc1': Common Docker Documentation Location in `gitlab-ce` fix deprecation warning present during webpack compiles Enable 5 lines of Sidekiq backtrace lines to aid in debugging Add support for copying permalink to notes via more actions dropdown Handle creating a nested group on MySQL correctly Decrease statuses batch size even more in a migration Fix repo editor scrollbar Replace 'source/search_code.feature' spinach test with an rspec analog Authorizations regarding OAuth - style confirmation Update README.md Refactor complicated API group finding rules into GroupsFinder Fix group and project search for anonymous users Document version Group Milestones API introduced Allow v4 API GET requests for groups to be unauthenticated Adjust a range and a size in stages statuses migration Update README.md Point to /developers on docs/administration/authentiq.md Indexes GFM markdown guide use inline links instead of referenced Add index on ci_runners.contacted_at
\| * \| \| \| \| \| \|	Merge branch 'master' into 'backstage/gb/rename-ci-cd-processing-sidekiq-queues'	Kamil Trzciński	2017-08-25	143	-411/+624
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \| \|	Enqueue a new stage worker in CI/CD processing queue	Grzegorz Bizon	2017-08-22	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into backstage/gb/rename-ci-cd-processing-sidekiq-queues	Grzegorz Bizon	2017-08-22	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 ...
\| * \| \| \| \| \| \| \| \|	Include build queue worker in the processing group	Grzegorz Bizon	2017-08-22	1	-1/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Assign some CI/CD workers to pipeline default queue	Grzegorz Bizon	2017-08-21	3	-6/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove sidekiq build queue and assign pipeline queue	Grzegorz Bizon	2017-08-21	6	-13/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Assign all pipeline workers to specific queues	Grzegorz Bizon	2017-08-21	6	-0/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Simplify pipeline sidekiq queues naming scheme	Grzegorz Bizon	2017-08-21	2	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Extend pipelines queue mixin and add a default queue	Grzegorz Bizon	2017-08-21	2	-1/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'jej/remove-dependent-destroy-from-protected-refs' into 'master'	Yorick Peterse	2017-08-28	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove 'dependent: :destroy' from ProtectedRef has_many :"#{type}_access_levels" See merge request !13835
\| * \| \| \| \| \| \| \| \| \|	Remove 'dependent: :destroy' from ProtectedRef has_many :"#{type}_access_levels"jej/remove-dependent-destroy-from-protected-refs	James Edwards-Jones	2017-08-25	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fire system hooks when a user is created via LDAP or OAuthsh-system-hooks-ldap-users	Stan Hu	2017-08-25	3	-5/+18
\| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #37073
* \| \| \| \| \| \| \| \|	Merge branch 'fix-repo-scrollbar' into 'master'	Jacob Schatz	2017-08-25	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix repo editor scrollbar Closes #37020 See merge request !13823
\| * \| \| \| \| \| \| \| \|	Fix repo editor scrollbarfix-repo-scrollbar	Clement Ho	2017-08-24	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-sidekiq-backtrace' into 'master'	Robert Speicher	2017-08-25	6	-0/+13
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable 5 lines of Sidekiq backtrace lines to aid in debugging Closes #27626 See merge request !13822
\| * \| \| \| \| \| \| \| \|	Enable 5 lines of Sidekiq backtrace lines to aid in debuggingsh-sidekiq-backtrace	Stan Hu	2017-08-25	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-fix-mysql-bare-repository-importer' into 'master'	Sean McGivern	2017-08-25	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle creating a nested group on MySQL correctly See merge request !13829
\| * \| \| \| \| \| \| \| \| \|	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 '35721-auth-style-confirmation' into 'master'	Clement Ho	2017-08-25	2	-37/+49
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Authorizations regarding OAuth - style confirmation Closes #35721 See merge request !13691
\| * \| \| \| \| \| \| \| \| \|	Authorizations regarding OAuth - style confirmation	Jacopo	2017-08-24	2	-37/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed the styling of OAuth authorization page in order to follow the styling structure described in #28849.