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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Enable RSpec/FilePath copenable-spec-file-name-cop	Sean McGivern	2017-04-26	35	-587/+342
\| \| \| \| \| \|	- Ignore JS fixtures - Ignore qa directory - Rewrite concern specs to put concern name first
*	Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master'	Sean McGivern	2017-04-25	4	-4/+18
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Don't display the `is_admin?` flag for user API responses Closes #29903 See merge request !10846
\| *	Don't display the `is_admin?` flag for user API responses.	Timothy Andrew	2017-04-25	4	-4/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- To prevent an attacker from enumerating the `/users` API to get a list of all the admins. - Display the `is_admin?` flag wherever we display the `private_token` - at the moment, there are two instances: - When an admin uses `sudo` to view the `/user` endpoint - When logging in using the `/session` endpoint
* \|	Merge branch 'gitaly-testing-toml' into 'master'	Rémy Coutable	2017-04-25	1	-3/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitaly testing toml Closes gitaly#182 See merge request !10605
\| * \|	Configure Gitaly through settings file instead of ENV varsgitaly-testing-toml	Alejandro Rodríguez	2017-04-18	1	-3/+4
\| \| \|
* \| \|	Merge branch 'use-jquery-on-blob-fork-suggestion' into 'master'	Jacob Schatz	2017-04-24	1	-15/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use jQuery niceness on blob_fork_suggestion See merge request !10858
\| * \| \|	Use jQuery niceness on blob_fork_suggestionuse-jquery-on-blob-fork-suggestion	Eric Eastwood	2017-04-22	1	-15/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10602#note_27871752
* \| \| \|	Merge branch 'add-aria-to-icon' into 'master'	Jacob Schatz	2017-04-24	1	-0/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add aria to icon See merge request !10670
\| * \| \| \|	Improve specsadd-aria-to-icon	Clement Ho	2017-04-24	1	-1/+3
\| \| \| \| \|
\| * \| \| \|	Add tests	Clement Ho	2017-04-18	1	-0/+13
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master'	Sean McGivern	2017-04-24	1	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure replying to an individual note by email creates a note with its own discussion ID Closes #31067 See merge request !10890
\| * \| \| \| \|	Ensure replying to an individual note by email creates a note with its own ↵dm-fix-individual-notes-reply-attributes	Douwe Maan	2017-04-24	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	discussion ID
* \| \| \| \| \|	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.