summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'docs-update-downgrade-service-removal-steps' into 'master'Achilleas Pipinellis (🌴 May 18 - May 21 🌴)2018-05-181-5/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update EE > CE downgrade service removal steps Closes #46441 See merge request gitlab-org/gitlab-ce!19034
| * | | | | | | | | Update EE > CE downgrade service removal stepsMark Fletcher2018-05-181-5/+16
| | | | | | | | | |
* | | | | | | | | | Merge branch 'qa-245' into 'master'Grzegorz Bizon2018-05-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loosen the matcher in the MR creation test Closes gitlab-qa#245 See merge request gitlab-org/gitlab-ce!19012
| * | | | | | | | | | Loosen the matcher in the MR creation testqa-245Rémy Coutable2018-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'sh-fix-grape-logging-status-code' into 'master'Douwe Maan2018-05-182-8/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix api_json.log not always reporting the right HTTP status code See merge request gitlab-org/gitlab-ce!19028
| * | | | | | | | | | Fix api_json.log not always reporting the right HTTP status codeStan Hu2018-05-172-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As described in https://github.com/aserafin/grape_logging/issues/45, if a Grape error is caught by the handlers and a different return code is returned, then the api_json.log would have a 500 error code instead of the right value. Inserting the GrapeLogging middleware after the Grape middleware fixes this problem. Seen in https://gitlab.com/gitlab-com/infrastructure/issues/4249
* | | | | | | | | | | Merge branch '45934-ide-firefox-scroll-md-preview' into 'master'Annabel Gray2018-05-182-6/+17
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Web IDE: Previewing Markdown in Firefox doesn’t show a scroll bar" Closes #45934 See merge request gitlab-org/gitlab-ce!18992
| * | | | | | | | | | | Resolve "Web IDE: Previewing Markdown in Firefox doesn’t show a scroll bar"André Luís2018-05-182-6/+17
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '46427-keyboard-shortcuts-for-kubernetes-and-environments' into ↵Annabel Gray2018-05-189-8/+84
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add Keyboard shortcuts for "Kubernetes" and "Environments" Closes #46427 See merge request gitlab-org/gitlab-ce!19002
| * | | | | | | | | | | Add Keyboard shortcuts for "Kubernetes" and "Environments"Lukas Eipert2018-05-189-8/+84
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'sh-move-delete-groups-api-async' into 'master'Robert Speicher2018-05-186-9/+25
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move API group deletion to Sidekiq See merge request gitlab-org/gitlab-ce!18626
| * | | | | | | | | | | Move API group deletion to SidekiqStan Hu2018-05-186-9/+25
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'update-ux-section' into 'master'Sarrah Vesselov2018-05-171-2/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add specific details related to how the UX team uses labels to tackle issues See merge request gitlab-org/gitlab-ce!18927
| * | | | | | | | | | | fix typos. add a reference to deliverable and stretch for design artifactSarrah Vesselov2018-05-171-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | add specific details related to how the UX team uses labels to tackle issuesupdate-ux-sectionSarrah Vesselov2018-05-121-1/+18
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix/assignee-name-wrap' into 'master'Annabel Gray2018-05-172-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix / assigne username wrapping problem has been fixed See merge request gitlab-org/gitlab-ce!18986
| * | | | | | | | | | | | fix / assigne username wrapping problem has been fixedMurat Dogan2018-05-172-3/+20
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '39584-nesting-depth-5-pages-pipelines' into 'master'Annabel Gray2018-05-172-37/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NestingDepth (level 5) in pages/pipelines.scss See merge request gitlab-org/gitlab-ce!18830
| * | | | | | | | | | | Apply NestingDepth (level 5) (pages/pipelines.scss)Takuya Noguchi2018-05-122-37/+26
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'dz-fix-list-bottom-margin' into 'master'Annabel Gray2018-05-172-10/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix group lists visual See merge request gitlab-org/gitlab-ce!19010
| * | | | | | | | | | | Fix group lists visualdz-fix-list-bottom-marginDmitriy Zaporozhets2018-05-172-10/+5
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reset p bottom margin for group lists to fix vertical alignment * Remove double border for group lists to be consistent with project lists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | Merge branch 'sh-remove-deprecation-warnings-from-com' into 'master'Mayra Cabrera2018-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conditionally enable deprecation log messages Closes #46158 and gitlab-com/infrastructure#4228 See merge request gitlab-org/gitlab-ce!18997
| * | | | | | | | | | Conditionally add Gitaly deprecation warnings based on ENV variableStan Hu2018-05-171-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '46193-fix-big-estimate' into 'master'Rémy Coutable2018-05-173-0/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Estimating a large amount results in a server error 500" Closes #46193 See merge request gitlab-org/gitlab-ce!18964
| * | | | | | | | | | | Fixes 500 error on /estimate BIG_VALUEJacopo2018-05-173-0/+22
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '46381-dropdown-mr-widget' into 'master'Annabel Gray2018-05-1712-117/+141
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Dropdown actions in mini pipeline graph in mr widget don't work" Closes #46381 See merge request gitlab-org/gitlab-ce!18976
| * | | | | | | | | | | Merge branch 'master' into 46381-dropdown-mr-widget46381-dropdown-mr-widgetFilipa Lacerda2018-05-1785-471/+980
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (40 commits) Add changelog Update quick_start_guide.md Resolve "Opening Project with invite but without accepting leads to 404 error page" Respect the inheritance chain between Ci::Build and CommitStatus Remove unneccessary imports fixed copy to cliboard button in embedded snippets Fix Error 500 viewing admin page due to statement timeouts Grant privileges after database is created Only setup db in the first checkout! Project Sidebar: Split CI/CD into CI/CD and Operations Fix GPM content types for Doorkeeper Workhorse to send raw diff and patch for commits Refactor out duplication in runner_policy.rb Remove unnecessary runner.is_shared? checks in api because they are handled by policy Allow admin to assign shared runner to project through API Change policy list_runner_jobs -> read_runner Rename User#ci_authorized_runners -> ci_owned_runners Improve efficiency of authorized_runner policy query Use can? policies for lib/api/runners.rb Allow group runners to be viewed/edited in API ...
| * | | | | | | | | | | | Fix eslintFilipa Lacerda2018-05-172-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Moves string to a constantFilipa Lacerda2018-05-173-3/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Reloads pipeline table when dropdown action is clicked and closes the ↵Filipa Lacerda2018-05-165-51/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dropdown in the MR widget
| * | | | | | | | | | | | [ci skip] Merge branch 'master' into 46381-dropdown-mr-widgetFilipa Lacerda2018-05-1649-281/+590
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (31 commits) Remove docker pull prefix from registry clipboard feature Document the 3h timeout for GitLab.com shared Runners Fix bug with long strings in issue boards Fix setting Gitlab metrics content types Add documentation for bulk editing of issues and merge requests Remove authentication for readonly endpoints in issues API Improve testing best practices guidelines Add a unique and not null constraint on the project_features.project_id column fix typos Frontend Guide, development_process.md Add index on runner_type for ci_runners Update docs describing `fast_spec_helper` best practices Display help text below auto devops domain with nip.io domain name (#45561) Add CHANGELOG Does not log failed sign-in attempts when database is in read-only mode Simplified priority, performance impact should be severity Ref contains oid check done by Gitaly code example formatting more typos typo in `endpoint` clarify that the function export should be default ...
| * | | | | | | | | | | | | Handles action icons requests in a contained way and shows a loading icon to ↵Filipa Lacerda2018-05-1510-113/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the user
* | | | | | | | | | | | | | Merge branch 'order_groups' into 'master'Rémy Coutable2018-05-175-2/+149
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Use case in-sensitive ordering by name for groups See merge request gitlab-org/gitlab-ce!18553
| * | | | | | | | | | | | | | Fix: Use case in-sensitive ordering by name for groupsHarish Ved2018-05-175-2/+149
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '6020-extract-ee-specific-controller-lines' into 'master'Robert Speicher2018-05-177-5/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Resolve "Extract EE specific files/lines for some controllers" See merge request gitlab-org/gitlab-ce!18994
| * | | | | | | | | | | | | | Backport changes from EE to minimize the CE/EE diff in ↵6020-extract-ee-specific-controller-linesRémy Coutable2018-05-162-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects::Settings::IntegrationsController Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | Introduce a new Keys::DestroyService serviceRémy Coutable2018-05-164-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | Add :weight as an allowed serializable field in ↵Rémy Coutable2018-05-161-1/+1
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app/controllers/boards/issues_controller.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | Merge branch 'pipelines-index-performance' into 'master'Grzegorz Bizon2018-05-1711-24/+233
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of Projects::PipelinesController#index See merge request gitlab-org/gitlab-ce!18427
| * | | | | | | | | | | | | Added changelog for pipelines page performanceYorick Peterse2018-05-171-0/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Exclude coverage data from the pipelines pageYorick Peterse2018-05-174-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When displaying a project's pipelines (Projects::PipelinesController#index) we now exclude the coverage data. This data was not used by the frontend, yet getting it would require one SQL query per pipeline. These queries in turn could be quite expensive on GitLab.com.
| * | | | | | | | | | | | | Preload pipeline data for project pipelinesYorick Peterse2018-05-177-7/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When displaying the pipelines of a project we now preload the following data: 1. Authors of the commits that belong to these pipelines 2. The number of warnings per pipeline, which is used by Ci::Pipeline#has_warnings? == Commit Authors Previously this data was queried for every Commit separately, leading to 20 SQL queries being executed in the worst case. With an average of 3 to 5 milliseconds per SQL query this could result in 100 milliseconds being spent in _just_ getting Commit authors. To preload this data Commit#author now uses BatchLoader (through Commit#lazy_author), and a separate module Gitlab::Ci::Pipeline::Preloader is used to ensure all authors are loaded before they are used. == Number of warnings This changes Ci::Pipeline#has_warnings? so it supports preloading of the number of warnings per pipeline. This removes the need for executing a COUNT(*) query for every pipeline just to see if it has any warnings or not.
| * | | | | | | | | | | | | Limit the number of pipelines to countYorick Peterse2018-05-172-15/+14
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When displaying the project pipelines dashboard we display a few tabs for different pipeline states. For every such tab we count the number of pipelines that belong to it. For large projects such as GitLab CE this means having to count over 80 000 rows, which can easily take between 70 and 100 milliseconds per query. To improve this we apply a technique we already use for search results: we limit the number of rows to count. The current limit is 1000, which means that if more than 1000 rows are present for a state we will show "1000+" instead of the exact number. The SQL queries used for this perform much better than a regular COUNT, even when a project has a lot of pipelines. Prior to these changes we would end up running a query like this: SELECT COUNT(*) FROM ci_pipelines WHERE project_id = 13083 AND status IN ('success', 'failed', 'canceled') This would produce a plan along the lines of the following: Aggregate (cost=3147.55..3147.56 rows=1 width=8) (actual time=501.413..501.413 rows=1 loops=1) Buffers: shared hit=17116 read=861 dirtied=2 -> Index Only Scan using index_ci_pipelines_on_project_id_and_ref_and_status_and_id on ci_pipelines (cost=0.56..2984.14 rows=65364 width=0) (actual time=0.095..490.263 rows=80388 loops=1) Index Cond: (project_id = 13083) Filter: ((status)::text = ANY ('{success,failed,canceled}'::text[])) Rows Removed by Filter: 2894 Heap Fetches: 353 Buffers: shared hit=17116 read=861 dirtied=2 Planning time: 1.409 ms Execution time: 501.519 ms Using the LIMIT count technique we instead run the following query: SELECT COUNT(*) FROM ( SELECT 1 FROM ci_pipelines WHERE project_id = 13083 AND status IN ('success', 'failed', 'canceled') LIMIT 1001 ) for_count This query produces the following plan: Aggregate (cost=58.77..58.78 rows=1 width=8) (actual time=1.726..1.727 rows=1 loops=1) Buffers: shared hit=169 read=15 -> Limit (cost=0.56..46.25 rows=1001 width=4) (actual time=0.164..1.570 rows=1001 loops=1) Buffers: shared hit=169 read=15 -> Index Only Scan using index_ci_pipelines_on_project_id_and_ref_and_status_and_id on ci_pipelines (cost=0.56..2984.14 rows=65364 width=4) (actual time=0.162..1.426 rows=1001 loops=1) Index Cond: (project_id = 13083) Filter: ((status)::text = ANY ('{success,failed,canceled}'::text[])) Rows Removed by Filter: 9 Heap Fetches: 10 Buffers: shared hit=169 read=15 Planning time: 1.832 ms Execution time: 1.821 ms While this query still uses a Filter for the "status" field the number of rows that it may end up filtering (at most 1001) is small enough that an additional index does not appear to be necessary at this time. See https://gitlab.com/gitlab-org/gitlab-ce/issues/43132#note_68659234 for more information.
* | | | | | | | | | | | | Merge branch '46177-fix-present-on-generic-commit-status' into 'master'Grzegorz Bizon2018-05-179-25/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "NoMethodError: undefined method `present' for #<GenericCommitStatus:0x00007f6eacf34a40>" Closes #46177 See merge request gitlab-org/gitlab-ce!18979
| * | | | | | | | | | | | | Add changelogMayra Cabrera2018-05-171-0/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Respect the inheritance chain between Ci::Build and CommitStatus46177-fix-present-on-generic-commit-statusMayra Cabrera2018-05-166-31/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moves the assertions were they belong
| * | | | | | | | | | | | | Makes CommitStatus and GenericCommitStatus respond to presentableMayra Cabrera2018-05-154-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods Includes Presentable module into CommitStatus. This fixes presenter methods being called on those classes. Closes #46177
* | | | | | | | | | | | | | Merge branch ↵Achilleas Pipinellis2018-05-171-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'docs/46042-document-that-project-templates-can-be-used-with-auto-devops' into 'master' Resolve "Document that Project Templates can be used with Auto DevOps" Closes #46042 See merge request gitlab-org/gitlab-ce!19009
| * | | | | | | | | | | | | Update quick_start_guide.mdFabio Busatto2018-05-171-0/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '42531-open-invite-404' into 'master'Douwe Maan2018-05-179-15/+157
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Opening Project with invite but without accepting leads to 404 error page" Closes #42531 See merge request gitlab-org/gitlab-ce!17634