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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'notebooklab-in-repo' into 'master'	Jacob Schatz	2017-04-24	8	-1/+417
\|\ \| \| \| \| \| \| \| \|	Moved NotebookLab assets into repo See merge request !10630
\| *	Merge branch 'master' into notebooklab-in-reponotebooklab-in-repo	Phil Hughes	2017-04-13	10	-97/+223
\| \|\
\| * \	Merge branch 'master' into notebooklab-in-repo	Phil Hughes	2017-04-13	29	-328/+1048
\| \|\ \
\| * \| \|	Pull in fixture files from the repo	Phil Hughes	2017-04-11	6	-7/+49
\| \| \| \|
\| * \| \|	Moved NotebookLab assets into repo	Phil Hughes	2017-04-11	6	-0/+374
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved all the notebooklab assets into the GitLab repo
* \| \| \|	Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master'	Sean McGivern	2017-04-24	1	-0/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in loading namespaces for every issuable in milestones See merge request !10871
\| * \| \| \|	Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-url	Stan Hu	2017-04-24	1	-0/+15
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master'	Sean McGivern	2017-04-24	1	-7/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix commenting on an existing discussion on an unchanged line that is no longer in the diff Closes #31339 See merge request !10888
\| * \| \| \| \|	Fix commenting on an existing discussion on an unchanged line that is no ↵	Douwe Maan	2017-04-24	1	-7/+2
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	longer in the diff
* \| \| \| \|	Merge branch '30305-oauth-token-push-code' into 'master'	Rémy Coutable	2017-04-24	2	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow OAuth clients to push code Closes #30305 See merge request !10677
\| * \| \| \| \|	Allow OAuth clients to push code30305-oauth-token-push-code	Timothy Andrew	2017-04-13	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- We currently support fetching code with username = 'oauth2' and password = <access_token>. - Trying to _push_ code with the same credentials fails with an authentication error. - There's no reason this shouldn't be enabled, especially since we allow the OAuth client to create deploy keys with push access: https://docs.gitlab.com/ce/api/deploy_keys.html#add-deploy-key
* \| \| \| \| \|	Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'	Rémy Coutable	2017-04-24	168	-362/+87
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !10567 Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Unnecessary "include WaitForAjax" and "include ApiHelpers"	Jacopo	2017-04-21	169	-364/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs. Removed unnecessary usage of `api:true`
* \| \| \| \| \| \|	Merge branch 'sh-optimize-duplicate-routable-full-path' into 'master'	Sean McGivern	2017-04-24	1	-0/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache Routable#full_path in RequestStore to reduce duplicate route loads See merge request !10872
\| * \| \| \| \| \| \|	Cache Routable#full_path in RequestStore to reduce duplicate route loadssh-optimize-duplicate-routable-full-path	Stan Hu	2017-04-24	1	-0/+18
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We see in #27387 that a call to `polymorphic_path` will cause duplicate SELECT route calls for each merge request in a milestone. This happens because calling `project.namespace.becomes(Namespace)` will instantiate a new instance of a Namespace for each merge request, which causes a N+1 query on the routes table. This change caches the state of the route by the specific class and ID, which dramatically eliminates duplicate work.
* \| \| \| \| \| \|	Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master'	Kamil Trzciński	2017-04-24	3	-31/+66
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly expire cache for all MRs of a pipeline Closes #31040 See merge request !10770
\| * \| \| \| \| \| \|	Simplify specs and remove unnecessary attributestc-realtime-every-pipeline-on-mr	Toon Claes	2017-04-24	2	-13/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refactor ExpirePipelineCacheWorker#perform	Toon Claes	2017-04-24	2	-8/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it gracefully handle unexisting pipelines and refactor iterating all the merge request paths.
\| * \| \| \| \| \| \|	Use a better performing query to find all MRs for pipeline	Toon Claes	2017-04-24	2	-1/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And add some specs.
\| * \| \| \| \| \| \|	Properly expire cache for all MRs of a pipeline	Toon Claes	2017-04-24	2	-7/+7
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turn ExpirePipelineCacheService into Worker so it can fetch all the merge requests for which the pipeline runs or did run against.
* \| \| \| \| \| \|	Merge branch 'fix/gb/fix-blocked-pipeline-duration' into 'master'	Kamil Trzciński	2017-04-24	1	-20/+45
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing duration for blocked pipelines Closes #31264 See merge request !10856
\| * \| \| \| \| \| \|	Improve helpers in pipeline model specs	Grzegorz Bizon	2017-04-21	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix missing pipeline duration for blocked pipelines	Grzegorz Bizon	2017-04-21	1	-19/+44
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master'	Kamil Trzciński	2017-04-24	3	-18/+85
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect commit status text on main project page See merge request !10863
\| * \| \| \| \| \| \| \|	Add specs for new ci status helper method	Grzegorz Bizon	2017-04-21	1	-9/+38
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix lastest commit status text on main project page	Grzegorz Bizon	2017-04-21	2	-9/+47
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rs-empty-project-features' into 'master'	Rémy Coutable	2017-04-24	18	-44/+56
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `:empty_project` where possible in top-level feature specs See merge request !10836
\| * \| \| \| \| \| \| \| \|	Use `:empty_project` where possible in top-level feature specsrs-empty-project-features	Robert Speicher	2017-04-20	18	-44/+56
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'dz-fix-spec-filenames-ce' into 'master'	Sean McGivern	2017-04-24	5	-51/+46
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect spec filenames which were ingored by CI See merge request !10875
\| * \| \| \| \| \| \| \| \| \|	Fix outdated specs that were not executed due to wrong filename	Dmitriy Zaporozhets	2017-04-24	2	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Fix incorrect spec filenames which were ingored by CIdz-fix-spec-filenames-ce	Dmitriy Zaporozhets	2017-04-24	5	-47/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch '29335-fix-request-access-button-visibility' into 'master'	Douwe Maan	2017-04-24	1	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added test to prevent ‘Request access’ regression See merge request !10866
\| * \| \| \| \| \| \| \| \| \| \|	Added test to prevent ‘Request access’ regression29335-fix-request-access-button-visibility	James Edwards-Jones	2017-04-22	1	-0/+11
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'mrchrisw-22740-merge-api' into 'master'	Sean McGivern	2017-04-24	1	-1/+13
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix updating merge_when_build_succeeds via merge API endpoint Closes #22740 See merge request !10873
\| * \| \| \| \| \| \| \| \| \| \|	Fix updating merge_when_build_succeeds via merge API endpointmrchrisw-22740-merge-api	Chris Wilson	2017-04-24	1	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When updating a merge request via the `/merge` endpoint we check the `mergeable` and `mergeable_state` status, these will return `false` if the application option only_allow_merge_if_pipeline_succeeds is enabled. We should skip CI checks if the request uses the merge_when_pipeline_succeeds param Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22740
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-rename-login_as' into 'master'	Rémy Coutable	2017-04-24	2	-5/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Except where necessary, use `sign_in` over `login_as` in features See merge request !10320
\| * \| \| \| \| \| \| \| \| \| \|	Return early from `finished_all_ajax_requests?` when jQuery is undefinedrs-rename-login_as	Robert Speicher	2017-04-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Simplify the `javascript_test?` helper	Robert Speicher	2017-04-19	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also don't try to run `page.evaluate_script` when we're not in a JavaScript test.
\| * \| \| \| \| \| \| \| \| \| \|	Remove unused `skip_ci_admin_auth` helper	Robert Speicher	2017-04-19	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '30306-transaction-while-moving-issues-to-ghost-user' into ↵	Yorick Peterse	2017-04-24	2	-0/+70
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add a transaction around `move_issues_to_ghost_user` See merge request !10465
\| * \| \| \| \| \| \| \| \| \| \|	Move records to the ghost user in a transaction.	Timothy Andrew	2017-04-24	2	-0/+70
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- While deleting a user, some of the user's associated records are moved to the ghost user so they aren't deleted. The user is blocked before these records are moved, to prevent the user from creating new records while the migration is happening, and so preventing a data race. - Previously, if the migration failed, the user would _remain_ blocked, which is not the expected behavior. On the other hand, we can't just stick the block + migration into a transaction, because we want the block to be committed before the migration starts (for the data race reason mentioned above). - One solution (implemented in this commit) is to block the user in a parent transaction, migrate the associated records in a nested sub-transaction, and then unblock the user in the parent transaction if the sub-transaction fails.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'submodules-no-dotgit' into 'master'	Dmitriy Zaporozhets	2017-04-22	1	-4/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	submodule_links: handle urls that don't end with .git See merge request !10799
\| * \| \| \| \| \| \| \| \| \|	submodule_links: handle urls that don't end with .git	David Turner	2017-04-21	1	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: David Turner <novalis@novalis.org>
* \| \| \| \| \| \| \| \| \| \|	Merge branch '30672-versioned-markdown-cache' into 'master'	Douwe Maan	2017-04-21	3	-132/+211
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Start versioning cached markdown fields Closes #30672 See merge request !10597
\| * \| \| \| \| \| \| \| \| \| \|	Start versioning cached markdown fields	Nick Thomas	2017-04-21	3	-122/+212
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove the ClearDatabaseCacheWorker	Nick Thomas	2017-04-21	1	-14/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dz-cleanup-add-users' into 'master'	Douwe Maan	2017-04-21	3	-3/+28
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor add_users method for project and group See merge request !10850
\| * \| \| \| \| \| \| \| \| \| \|	Refactor add_users method for project and groupdz-cleanup-add-users	Dmitriy Zaporozhets	2017-04-21	3	-3/+28
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'form-focus-previous-incorrect-form' into 'master'	Filipa Lacerda	2017-04-21	1	-0/+45
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the preview keyboard shortcut focusing wrong tab Closes #31101 See merge request !10849
\| * \| \| \| \| \| \| \| \| \| \|	Improved the specform-focus-previous-incorrect-form	Phil Hughes	2017-04-21	1	-9/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now correctly tests against different forms