summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* update specfix/import-user-validation-errorJames Lopez2017-01-311-6/+2
|
* use destroy_allJames Lopez2017-01-311-3/+1
|
* add changelogJames Lopez2017-01-311-0/+4
|
* remove old project members from projectJames Lopez2017-01-311-0/+4
|
* add spec replicating validation errorJames Lopez2017-01-311-0/+28
|
* Merge branch '27474-update-auto-deploy-requires-public-project' into 'master' Achilleas Pipinellis2017-01-311-1/+2
|\ | | | | | | | | | | | | Resolve "Document that auto deploy only works for public projects" Closes #27474 See merge request !8897
| * Update index.md27474-update-auto-deploy-requires-public-projectJoshua Lambert2017-01-311-1/+1
| |
| * Clarify that Auto Deploy requires a public project.Joshua Lambert2017-01-311-1/+2
| |
* | Merge branch 'improve-process' into 'master' Achilleas Pipinellis2017-01-311-77/+23
|\ \ | | | | | | | | | | | | Remove outdated text and link to up-to-date documentation See merge request !8789
| * | Remove outdated text and link to up-to-date documentationimprove-processRémy Coutable2017-01-251-77/+23
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '27488-fix-jwt-version' into 'master' Kamil Trzciński2017-01-313-4/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update and pin the `jwt` gem to ~> 1.5.6 Closes #27488 See merge request !8900
| * | | Update and pin the `jwt` gem to ~> 1.5.627488-fix-jwt-versionRémy Coutable2017-01-313-4/+8
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch ↵Kamil Trzciński2017-01-3118-53/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25910-convert-manual-action-icons-to-svg-to-propperly-position-them' into 'master' Convert pipeline action icons to svg to have them propperly positioned Closes #25910 See merge request !8766
| * | | | Fixes after review25910-convert-manual-action-icons-to-svg-to-propperly-position-themFilipa Lacerda2017-01-262-5/+5
| | | | |
| * | | | Removed unused methodFilipa Lacerda2017-01-262-7/+0
| | | | |
| * | | | Fix broken testsFilipa Lacerda2017-01-256-15/+15
| | | | | | | | | | | | | | | | | | | | Fix linter error
| * | | | Remove unneeded 'borderless' from icons nameFilipa Lacerda2017-01-258-5/+5
| | | | |
| * | | | changelog entrydimitrieh2017-01-251-0/+4
| | | | |
| * | | | fixed pipeline graph action buttons and counter badge positioningdimitrieh2017-01-251-23/+19
| | | | |
| * | | | added icons and fixed mini pipeline action dropdown iconsdimitrieh2017-01-2511-8/+24
| | | | |
* | | | | Merge branch '26852-fix-slug-for-openshift' into 'master' Kamil Trzciński2017-01-314-10/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid repeated dashes in $CI_ENVIRONMENT_SLUG Closes #26852 See merge request !8638
| * | | | | Avoid repeated dashes in $CI_ENVIRONMENT_SLUGNick Thomas2017-01-234-10/+35
| | | | | |
* | | | | | Merge branch 'zj-display-error-team-fetch' into 'master' Kamil Trzciński2017-01-316-9/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent return type Closes #27150 See merge request !8290
| * | | | | | Updated test for new error resultzj-display-error-team-fetchLuke "Jared" Bennett2017-01-301-1/+1
| | | | | | |
| * | | | | | Update #list_teams to propagate errorsZ.J. van de Weg2017-01-306-14/+12
| | | | | | |
| * | | | | | Added error message and testLuke "Jared" Bennett2017-01-243-1/+13
| | | | | | |
| * | | | | | Fix inconsistent return typeZ.J. van de Weg2017-01-245-11/+11
| | | | | | |
* | | | | | | Merge branch '24795_refactor_merge_request_build_service' into 'master' Sean McGivern2017-01-313-58/+77
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor MergeRequest::BuildService Closes #24795 See merge request !8462
| * | | | | | | refactor merge request build serviceRydkin Maxim2017-01-313-58/+77
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add changelog entry replace local variables `merge_request` with instance ones modify `MergeRequests::BuildService` to fix failed tests extract `assign_target_project` method remove unnecessary instance variables remove exclamation marks and rewrite conditionals to improve readability extract `params_does_not_contain_branches?` method, rename `unprepared_merge_request` method to `uncreatable_merge_request` replace instance variables `merge_request` and `error_messages` with getters and setters; divide `set_title_and_description` method on two separate ones refactor `execute` method return `set_title_and_description` method rename `branches_selected?` method to `branches_present?` to make it more different from `branches_specified?` fixes after discussion renamed method branches_valid? fix space return assigning methods into `execute` method simplify `find_target_branch` and `find_source_project` methods fix spec `merge request issuable record that supports slash commands in its description and notes`
* | | | | | | Merge branch 'patch-12' into 'master' James Lopez2017-01-311-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Services changed to Integrations See merge request !8686
| * | | | | | Services changed to Integrations to slack.mdDoğukan KOTAN2017-01-211-1/+1
| | | | | | |
* | | | | | | Merge branch 'remove-warning-to-login' into 'master' Rémy Coutable2017-01-313-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove flash warning from login page See merge request !8864
| * | | | | | | Remove flash warning from login pagePadilla, Gerald2017-01-303-1/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ensure-rake-is-called-within-the-correct-bundle-context' into ↵Rémy Coutable2017-01-311-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensure rake is called within the correct bundle context See merge request !8882
| * | | | | | | Ensure rake is called within the correct bundle contextensure-rake-is-called-within-the-correct-bundle-contextLuke "Jared" Bennett2017-01-301-4/+4
| | | | | | | |
* | | | | | | | Merge branch 'feature/gb/expose-commit-and-mr-pipelines-api' into 'master'Rémy Coutable2017-01-3121-69/+117
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Expose pipelines API for commits and merge requests See merge request !8837
| * | | | | | | Use ApiHelpers in merge request specs for API routesfeature/gb/expose-commit-and-mr-pipelines-apiGrzegorz Bizon2017-01-301-11/+5
| | | | | | | |
| * | | | | | | Add controller tests for commit pipelines endpointGrzegorz Bizon2017-01-271-5/+19
| | | | | | | |
| * | | | | | | Add controller test for merge requests pipelines APIGrzegorz Bizon2017-01-272-2/+34
| | | | | | | |
| * | | | | | | Fix cycle analytics code after improving serializersGrzegorz Bizon2017-01-277-7/+7
| | | | | | | |
| * | | | | | | Expose serialized pipelines API for merge requestsGrzegorz Bizon2017-01-271-1/+10
| | | | | | | |
| * | | | | | | Expose serialized pipelines for commit pipelinesGrzegorz Bizon2017-01-272-5/+15
| | | | | | | |
| * | | | | | | Return serializable hash from a represented serializerGrzegorz Bizon2017-01-278-40/+29
| | | | | | | |
* | | | | | | | Merge branch 'sh-add-project-id-index-project-authorizations' into 'master' Yorick Peterse2017-01-303-1/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project ID index to `project_authorizations` table to optimize queries Closes #27443 See merge request !8890
| * | | | | | | | Add project ID index to `project_authorizations` table to optimize queriessh-add-project-id-index-project-authorizationsStan Hu2017-01-303-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As described in #27443, the `project_authorizations` table is often used to retrieve all team members of this project. This can lead to a number of slow queries impacting load times. This MR adds an index for just `project_id`. Closes #27443
* | | | | | | | | Merge branch '26282-autosize-js-memory-leak' into 'master' Alfredo Sumaran2017-01-307-319/+222
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "ba-resize memory leak" Closes #26282 See merge request !8412
| * | | | | | | | remove ba-resize26282-autosize-js-memory-leakLuke "Jared" Bennett2017-01-207-319/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor js-autosize code now that ba-resize is gone Added specs
* | | | | | | | | Merge branch 'issue-sidebar-empty-assignee' into 'master' Fatih Acet2017-01-304-1/+46
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resets issue boards assignee dropdown Closes #26514 and #26814 See merge request !8540
| * | | | | | | | | Clears all dropdown menus in issue sidebar when it opensissue-sidebar-empty-assigneePhil Hughes2017-01-201-4/+6
| | | | | | | | | |
| * | | | | | | | | Resets issue boards assignee dropdownPhil Hughes2017-01-204-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #26514