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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'	Douwe Maan	2017-06-05	2	-9/+26
\|\ \| \| \| \| \| \| \| \|	backports changed import logic from pull mirroring feature into CE See merge request !11850
\| *	backports changed import logic from pull mirroring feature into CE	Tiago Botelho	2017-06-05	2	-9/+26
\| \|
* \|	Merge branch '28694-hard-delete-user-from-admin-panel' into 'master'	Douwe Maan	2017-06-05	3	-4/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow users to be hard-deleted from the admin panel Closes #28694 See merge request !11874
\| * \|	Refactor the DeleteUserWorker	Nick Thomas	2017-06-05	3	-4/+7
\| \| \|
* \| \|	Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master'	Tim Zallmann	2017-06-05	3	-21/+22
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport EE refactorings for Protected Tag EE-only functionality See merge request !11125
\| * \| \|	Backport EE refactorings for Protected Tag EE-only functionalityjej-backport-protected-tag-ee-role-refactorings	James Edwards-Jones	2017-05-31	3	-21/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements and refactorings were made while adding role based permissions for protected tags to EE. This doesn’t backport the feature, but should improve code quality and minimize divergence.
* \| \| \|	Merge branch '33154-permissions-for-project-labels-and-group-labels' into ↵	Douwe Maan	2017-06-05	4	-8/+14
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Permissions for project labels and group labels" Closes #33154 See merge request !11876
\| * \| \|	Allow group reporters to manage group labels33154-permissions-for-project-labels-and-group-labels	Sean McGivern	2017-06-05	4	-8/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, only group masters could do this. However, project reporters can manage project labels, so there doesn't seem to be any need to restrict group labels further. Also, save a query or two by getting a single GroupMember object to find out if the user is a master or not.
* \| \| \|	Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'	Phil Hughes	2017-06-05	4	-0/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. See merge request !11478
\| * \ \ \	Merge remote-tracking branch 'origin/master' into ↵	Luke "Jared" Bennett	2017-06-02	55	-189/+213
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix-realtime-edited-text-for-issues-9-3
\| * \| \| \| \|	Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.	Luke "Jared" Bennett	2017-05-31	4	-0/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'	Kamil Trzciński	2017-06-05	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add slugified project path to CI environment variables Closes #31061 See merge request !11838
\| * \| \| \| \| \|	Add slugify project path to CI enviroment variables	vanadium23	2017-06-03	1	-0/+1
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'zj-job-view-goes-real-time' into 'master'	Kamil Trzciński	2017-06-05	2	-9/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Initial implementation for real time job view Closes #31397 See merge request !11651
\| * \| \| \| \| \|	retryable? is now available for CommitStatuszj-job-view-goes-real-time	Z.J. van de Weg	2017-06-04	1	-1/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-time	Kamil Trzcinski	2017-06-02	53	-170/+191
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-time	Z.J. van de Weg	2017-06-01	2	-9/+11
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Incorporate review	Z.J. van de Weg	2017-05-31	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Create PipelineDetailsEntity	Z.J. van de Weg	2017-05-31	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now we have a PipelineEntity which is a bit smaller, mostly in bytes needing to send to the frontend. PipelineDetailsEntity is the default for the PipelineSerializer, limiting the changes needed. This commit also incorporates the review.
\| * \| \| \| \| \| \|	Initial implementation for real time job view	Z.J. van de Weg	2017-05-31	1	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added the needed keys and paths to a new entity, BuildDetailsEntity. Not renaming BuildEntity to BuildBasicEntity on explicit request. Most code now has test coverage, but not all. This will be added on later commits on this branch. Resolves gitlab-org/gitlab-ce#31397
* \| \| \| \| \| \| \|	Merge branch 'sidekiq-transaction' into 'master'	Sean McGivern	2017-06-05	6	-14/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Forbid Sidekiq scheduling in transactions Closes #27233 See merge request !9376
\| * \| \| \| \| \| \| \|	Don’t schedule workers from inside transactions	Douwe Maan	2017-06-02	6	-14/+24
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '30469-convdev-index' into 'master'	Sean McGivern	2017-06-05	3	-0/+66
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ConvDev Index Closes #30469 See merge request !11377
\| * \| \| \| \| \| \| \|	Use sum instead of map + inject	Adam Niedzielski	2017-06-02	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add Conversational Development Index page to admin panel	Taurie Davis, Simon Knox and Adam Niedzielski	2017-06-01	3	-0/+66
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '25680-CI_ENVIRONMENT_URL' into 'master'	Kamil Trzciński	2017-06-05	1	-3/+24
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `$CI_ENVIRONMENT_URL` as a job variable Closes #25680 See merge request !11695
\| * \| \| \| \| \| \| \| \|	CreatePipelineBuildsService would have created env	Lin Jen-Shin	2017-06-02	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So we don't have to do it in CreateDeploymentService Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11695#note_31322649
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL	Lin Jen-Shin	2017-06-02	20	-83/+81
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (39 commits) Resolve "Improve Container Registry description" Add username parameter to gravatar URL Fix replying to a commit discussion displayed in the context of an MR Add fog-aliyun as backup storage provider Add missing specs Make sure protected can't be null; Test protected! Update session cookie key name to be unique to instance in development Just mention which GitLab version is required Fix data inconsistency issue for old artifacts by moving them to a currently used path Fix N+1 queries for non-members in comment threads Fix rubocop in spec/helpers/diff_helper_spec.rb Merge two items into one in the doc Only remove FK if it exists Maintain notes avatar at smaller breakpoint Fix pipeline schedule value name in documentation Add test for Project#protected_for? Update diff discussion position per discussion instead of per note Display Shared Runner status in Admin Dashboard Make sure we're loading the fresh variables Now secret_variables_for would return the variables ...
\| * \| \| \| \| \| \| \| \| \|	Fix other use of CreateDeploymentService and make	Lin Jen-Shin	2017-06-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it a bit more robust against missing options, which we did guard on for some cases.
\| * \| \| \| \| \| \| \| \| \|	Merge all environment url methods, introduce ensure_persisted_environment	Lin Jen-Shin	2017-06-01	1	-11/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To make sure that we're accessing the same instance, so ending up with `env.external` = `env.external_url` shall be fine.
\| * \| \| \| \| \| \| \| \| \|	Simplify CreateDeploymentService so that it uses	Lin Jen-Shin	2017-06-01	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	methods directly from job, avoid duplicating the works.
\| * \| \| \| \| \| \| \| \| \|	Introduce ci_environment_url which would fallback	Lin Jen-Shin	2017-06-01	1	-15/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to the external_url from persisted environment, and make the other utility methods private as we don't really need to use them outside of the job.
\| * \| \| \| \| \| \| \| \| \|	Just use the url from options, not saving it as a column	Lin Jen-Shin	2017-06-01	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't make this change for now to reduce conflicts	Lin Jen-Shin	2017-06-01	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL	Lin Jen-Shin	2017-06-01	23	-197/+115
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (251 commits) Don't match email addresses or foo@bar as user references Revert "Update GITLAB_SHELL_VERSION" Update GITLAB_SHELL_VERSION Add feature toggles through Flipper Change no_limits to limits Move includes call to scope Add GitLab Resources to University Add Documentation for GIT_CHECKOUT variable Remove entry variable Do not try to preload Commits when using Note.includes(:noteable) Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Introduce source to pipeline entity Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions ...
\| * \| \| \| \| \| \| \| \| \| \|	Move the condition to persisted_environment_variables	Lin Jen-Shin	2017-05-27	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11695?resolved_conflicts=true#note_30797842
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into '25680-CI_ENVIRONMENT_URL'	Lin Jen-Shin (godfat)	2017-05-26	14	-117/+107
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \| \| \| \| \| \|	Pass external_url from environment if job doesn't have one	Lin Jen-Shin	2017-05-25	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also update the document and add a changelog entry
\| * \| \| \| \| \| \| \| \| \| \| \|	Add tests for CI_ENVIRONMENT_URL	Lin Jen-Shin	2017-05-25	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Implement $CI_ENVIRONMENT_URL for jobs	Lin Jen-Shin	2017-05-25	1	-10/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We introduce ci_builds.environment_url and expand it when passing to runners. In the future the deployment could also retrieve the URL from the job instead of from the environment, which might have a different external URL because of another deployment happened.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'	Robert Speicher	2017-06-02	1	-5/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the new Gitaly CommitDiff RPC See merge request !11826
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpc	Ahmad Sherif	2017-06-02	1	-5/+6
\| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rc/enable-PreferredHashMethods-cop' into 'master'	Robert Speicher	2017-06-02	5	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable the Style/PreferredHashMethods cop See merge request !11883
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-cop	Rémy Coutable	2017-06-02	5	-7/+7
\| \| \|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '33139-lint-our-factories' into 'master'	Grzegorz Bizon	2017-06-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lint our factories creation in addition to their build Closes #33139 See merge request !11823
\| * \| \| \| \| \| \| \| \| \| \| \|	Lint our factories creation in addition to their build33139-lint-our-factories	Rémy Coutable	2017-06-02	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '33215-fix-hard-delete-of-users' into 'master'	Douwe Maan	2017-06-02	1	-5/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix hard-deleting users when they have authored issues Closes #33215 See merge request !11855
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix hard-deleting users when they have authored issues	Nick Thomas	2017-06-02	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '31511-jira-settings' into 'master'	Sean McGivern	2017-06-02	23	-44/+53
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599
\| * \| \| \| \| \| \| \| \| \| \| \|	Address MR comments	Jarka Kadlecova	2017-06-01	4	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \|