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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch ↵	Kamil Trzciński	2017-09-05	1	-52/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix/sm/35650-remove-createtriggerrequestservice-and-forbid-to-persist-variables-on-ci-triggerrequest' into 'master' Removes `CreateTriggerRequestService` and add a blocker to prevent saving variables on `Ci::TriggerRequest` Closes #35650 See merge request !13792
\| *	Remove CreateTriggerRequestService and forbit to save variables on ↵	Shinya Maeda	2017-09-04	1	-52/+0
\| \| \| \| \| \| \| \|	Ci::TriggerRequest
* \|	Use script_failure. Add runner_system_failure. Improve spec.feature/sm/37239-implement-failure_reason-on-ci_builds	Shinya Maeda	2017-09-05	1	-1/+1
\| \|
* \|	- Allow runner API to pass failure_reason	Shinya Maeda	2017-09-05	1	-1/+1
\| \| \| \| \| \| \| \|	- Fix spec
* \|	Fix enum lists	Shinya Maeda	2017-09-05	1	-1/+1
\| \|
* \|	Implement `failure_reason` on `ci_builds`	Shinya Maeda	2017-09-05	1	-0/+1
\|/
*	Merge branch ↵	Kamil Trzciński	2017-09-04	3	-20/+88
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'feature/sm/33281-protected-runner-executes-jobs-on-protected-branch' into 'master' Protected runner executes jobs on protected branch [Solution 1] Closes #33281 See merge request !13194
\| *	Fix spec on egister_job_service_spec.rbfeature/sm/33281-protected-runner-executes-jobs-on-protected-branch	Shinya Maeda	2017-09-03	1	-32/+32
\| \|
\| *	Fix spec	Shinya Maeda	2017-09-03	1	-1/+1
\| \|
\| *	Fix spec	Shinya Maeda	2017-09-03	2	-14/+40
\| \|
\| *	Fix spec	Shinya Maeda	2017-09-03	1	-2/+2
\| \|
\| *	Improve spec. Add validation for accel_level on runner.	Shinya Maeda	2017-09-03	1	-2/+4
\| \|
\| *	Remove access_level index from runner. Add protected on ci_pipelines. Add ↵	Shinya Maeda	2017-09-03	1	-0/+2
\| \| \| \| \| \| \| \|	protected index on ci_builds.
\| *	Fix spec	Shinya Maeda	2017-09-03	1	-2/+2
\| \|
\| *	Refactor access_level to not_protected and ref_protected	Shinya Maeda	2017-09-03	1	-1/+1
\| \|
\| *	Fix spec	Shinya Maeda	2017-09-03	1	-1/+1
\| \|
\| *	Add the rest of specs	Shinya Maeda	2017-09-03	1	-0/+38
\| \|
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Jose Ivan Vargas	2017-09-03	2	-0/+30
\|\ \ \| \|/
\| *	Fix a spec failure dependent on load orderrs-fix-master	Robert Speicher	2017-09-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	We were incorrectly stubbing `Issues::MoveService#execute`. This only caused a failure when another spec caused it to be autoloaded -- `spec/controllers/projects/issues_controller_spec.rb` in this case.
\| *	Merge branch 'move-action' into 'master'	Sean McGivern	2017-09-01	2	-0/+30
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Merge request to address /move functionality. See merge request !13436
\| \| *	/move project functionality. Squash commit.	Manolis Mavrofidis	2017-08-31	2	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update to add all issues to be updated. Added functionality, proper tests, documentation and changelog.
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2017-09-01	1	-22/+8
\|\ \ \ \| \|/ /
\| * \|	Optimize system note service specs	Grzegorz Bizon	2017-08-31	1	-22/+8
\| \| \|
* \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Marin Jankovski	2017-08-31	4	-2/+103
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Merge branch '36743-existing-repo-master' into 'master'	Douwe Maan	2017-08-31	4	-2/+103
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Prevent project creation (blank, import or fork) when repository already exists on disk See merge request gitlab/gitlabhq!2169
\| \| * \|	Prevent new / renamed project from using a repository path that already ↵	Gabriel Mazetto	2017-08-25	4	-2/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	exists on disk There are some redundancies in the validation steps, and that is to preserve current error messages behavior Also few specs have to be changed in order to fix madness in validation logic.
* \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-08-30	24	-176/+351
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	36807-gc-unwanted-refs-after-import * upstream/master: (225 commits) Add changelog entry Backports EE 2756 logic to CE. Make rubocop happy Make profile settings dropdown consistent Add filter by my reaction Update spec initialization with it being a shared component Update identicon path and selector Renamed to `identicon` and make shared component Merge branch 'master-i18n' into 'master' Fix broken Frontend JS guide Replace 'project/star.feature' spinach test with an rspec analog Adds position fixed to right sidebar Fixes the margin of the top buttons of the pipeline page Remove commented out code Better align fallback image emojis Decrease Metrics/CyclomaticComplexity threshold to 15 Add changelog Respect the default visibility level when creating a group Further break with_repo_branch_commit into parts Make sure inspect doesn't generate crazy string ...
\| * \| \|	Merge branch '35793_fix_predicate_names' into 'master'	Robert Speicher	2017-08-29	3	-7/+7
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `is_` prefix from predicate method names See merge request !13810
\| \| * \| \|	replace `is_spam?` with `spam?`	Maxim Rydkin	2017-08-29	2	-5/+5
\| \| \| \| \|
\| \| * \| \|	replace `is_default_branch?` with `default_branch?`	Maxim Rydkin	2017-08-29	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch ↵	Kamil Trzciński	2017-08-29	1	-15/+11
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix/sm/37040-regression-pipeline-trigger-via-api-fails-with-500-internal-server-error-in-9-5-1' into 'master' Fix pipeline trigger via API fails with 500 Internal Server Error in 9.5.1 Closes #37040 See merge request !13861
\| \| * \| \| \|	Fix specfix/sm/37040-regression-pipeline-trigger-via-api-fails-with-500-internal-server-error-in-9-5-1	Shinya Maeda	2017-08-29	1	-14/+10
\| \| \| \| \| \|
\| \| * \| \| \|	Fix spec	Shinya Maeda	2017-08-29	1	-3/+3
\| \| \|/ / /
\| * \| \| \|	Cleans merge_jid when possible on MergeService36114-stuck-mrs-job-follow-up	Oswaldo Ferreira	2017-08-28	1	-5/+28
\| \| \| \| \|
\| * \| \| \|	Track enqueued and ongoing MRs	Oswaldo Ferreira	2017-08-28	1	-0/+9
\| \|/ / /
\| * \| \|	Merge branch '36792-inline-user-refresh-when-creating-project' into 'master'	Douwe Maan	2017-08-28	2	-1/+8
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't wait for project authorization sidekiq jobs when creating projects Closes #36792 See merge request !13775
\| \| * \| \|	Don't add admins as masters to projects created in another user's namespace	Nick Thomas	2017-08-25	1	-1/+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	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'rs-aggregate-system-note-specs' into 'master'	Douwe Maan	2017-08-28	1	-25/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Combine multiple expectations into one for shared system note example See merge request !13814
\| \| * \| \| \|	Combine multiple expectations into one for shared system note examplers-aggregate-system-note-specs	Robert Speicher	2017-08-24	1	-25/+4
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are all performing unique checks on the same object, so there's no benefit to isolating them.
\| * \| \| \|	Merge branch '35642-add-owner-to-triggers-factory' into 'master'	Kamil Trzciński	2017-08-28	1	-1/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure we have an owner for triggers Closes #35642 See merge request !13799
\| \| * \ \ \	Merge remote-tracking branch 'upstream/master' into ↵35642-add-owner-to-triggers-factory	Lin Jen-Shin	2017-08-28	6	-80/+80
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	35642-add-owner-to-triggers-factory * upstream/master: (49 commits) Fire system hooks when a user is created via LDAP or OAuth 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 Docs: update - fix headers Handle creating a nested group on MySQL correctly Decrease statuses batch size even more in a migration Fix failure when issue author is nil Fix searching for files by path Fix invite by email address duplication Revert "Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'" Fix repo editor scrollbar Revert "Merge branch 'sh-sidekiq-backtrace' into 'master'" Replace 'source/search_code.feature' spinach test with an rspec analog Add missing third argument to `Git::Repository#initialize` in spec New doc: how to install GitLab on Azure Authorizations regarding OAuth - style confirmation Enable 5 lines of Sidekiq backtrace lines to aid in debugging Reenable MySQL tests on all branches ...
\| \| * \| \| \| \|	Make default trigger factory generate an owner	Lin Jen-Shin	2017-08-25	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And specify owners more clearly
\| * \| \| \| \| \|	Merge branch 'sh-simplify-system-hook-testing' into 'master'	Douwe Maan	2017-08-28	1	-27/+6
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-27/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+14
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bugfix.notify custom participants Closes #36610 See merge request !13680
\| \| * \| \| \| \| \|	rm a comment that is a lie	http://jneen.net/	2017-08-21	1	-1/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	add a spec for a participant with a :custom setting	http://jneen.net/	2017-08-21	1	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	where that custom setting is not enabled.
\| * \| \| \| \| \| \|	Fire system hooks when a user is created via LDAP or OAuthsh-system-hooks-ldap-users	Stan Hu	2017-08-25	1	-1/+16
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #37073
\| * \| \| \| \| \|	Handle creating a nested group on MySQL correctlybvl-fix-mysql-bare-repository-importer	Bob Van Landuyt	2017-08-25	1	-26/+61
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we don't support nested groups on MySQL, raise an error explaining that on import instead of trying anyway.