summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Try to fetch the CE branch in EE because sometimes it has the same name6045-extract-ee-specific-specs-linesRémy Coutable2018-05-241-2/+2
* Reduce CE/EE diff in spec/controllers/projects/project_members_controller_spe...Rémy Coutable2018-05-241-1/+1
* Reduce CE/EE diff in spec/controllers/projects/issues_controller_spec.rbRémy Coutable2018-05-241-1/+1
* Reduce CE/EE diff in spec/controllers/projects/imports_controller_spec.rbRémy Coutable2018-05-241-12/+6
* Reduce CE/EE diff in spec/controllers/projects/group_links_controller_spec.rbRémy Coutable2018-05-241-0/+12
* Reduce CE/EE diff in spec/controllers/projects/environments_controller_spec.rbRémy Coutable2018-05-242-0/+17
* Reduce CE/EE diff in app/controllers/projects/clusters_controller.rbRémy Coutable2018-05-242-18/+4
* Reduce CE/EE diff in spec/controllers/projects/branches_controller_spec.rbRémy Coutable2018-05-241-0/+18
* Reduce CE/EE diff in spec/controllers/projects/boards_controller_spec.rbRémy Coutable2018-05-241-18/+48
* Reduce CE/EE diff in spec/controllers/boards/issues_controller_spec.rbRémy Coutable2018-05-241-1/+1
* Merge branch 'commit-branch-tag-icon-update' into 'master'Phil Hughes2018-05-245-7/+13
|\
| * Updated branches and tag icons in commit detailsConstance Okoghenun2018-05-245-7/+13
|/
* Merge branch 'ce-6127-move-merge-requests-services' into 'master'Rémy Coutable2018-05-242-4/+13
|\
| * Extract a do_execute method to be overriddence-6127-move-merge-requests-servicesLin Jen-Shin2018-05-241-2/+6
| * Avoid using expect_any_instance_ofLin Jen-Shin2018-05-231-2/+7
* | Merge branch 'issue_38418' into 'master'Rémy Coutable2018-05-245-18/+84
|\ \
| * | Fix sidebar issue countissue_38418Felipe Artur2018-05-245-18/+84
* | | Merge branch '5779_rename_code_quality_job_and_artifact' into 'master'Achilleas Pipinellis2018-05-245-15/+22
|\ \ \
| * | | Add deprecation notice in documentation5779_rename_code_quality_job_and_artifactOlivier Gonzalez2018-05-231-0/+7
| * | | Do not update project's .gitlab-ci.yml right nowOlivier Gonzalez2018-05-231-2/+2
| * | | Rename code quality job and artifact. Refs gitlab-org/gitlab-ee#5779Olivier Gonzalez2018-05-236-17/+17
* | | | Merge branch 'docs-backport-ee-5794-to-ce' into 'master'Achilleas Pipinellis2018-05-241-2/+2
|\ \ \ \
| * | | | Merge branch 'patch-7' into 'master'docs-backport-ee-5794-to-ceMarcia Ramos2018-05-241-2/+2
* | | | | Merge branch 'sh-fix-backup-specific-rake-task' into 'master'Rémy Coutable2018-05-2414-114/+163
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix backup creation and restore for specific Rake tasksStan Hu2018-05-2414-114/+163
|/ / / /
* | | | Merge branch '46723-api-created-issue-do-not-get-assigned-to-specified-milest...Achilleas Pipinellis2018-05-242-4/+4
|\ \ \ \
| * | | | Clarify milestone_id scope for API operations on IssuablesMark Fletcher2018-05-242-4/+4
* | | | | Merge branch '5778_rename_container_scanning_job_and_artifact' into 'master'Achilleas Pipinellis2018-05-242-12/+19
|\ \ \ \ \
| * | | | | Rename container scanning job and artifactOlivier Gonzalez2018-05-242-12/+19
|/ / / / /
* | | | | Merge branch 'docs-update-backup-restore-guide' into 'master'Achilleas Pipinellis2018-05-241-6/+6
|\ \ \ \ \
| * | | | | add info about the current format of the backup name and refresh examples of ...Alexander Tanayno2018-05-241-6/+6
|/ / / / /
* | | | | Merge branch '46741-add-access-control-allow-headers-wds' into 'master'Mike Greiling2018-05-241-1/+4
|\ \ \ \ \
| * | | | | Add `Access-Control-Allow-Headers` to Webpack Dev Server configKushal Pandya2018-05-241-1/+4
* | | | | | Merge branch 'ce-jej/saml-failure-messages' into 'master'Grzegorz Bizon2018-05-243-2/+17
|\ \ \ \ \ \
| * | | | | | Backport helpers from GroupSAML failure messagesce-jej/saml-failure-messagesJames Edwards-Jones2018-05-213-2/+17
* | | | | | | Merge branch 'fl-loading-icon' into 'master'Phil Hughes2018-05-243-4/+22
|\ \ \ \ \ \ \
| * | | | | | | Show loading icon only when making the requestfl-loading-iconFilipa Lacerda2018-05-233-4/+22
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mr-conflict-notification' into 'master'Douwe Maan2018-05-2424-85/+373
|\ \ \ \ \ \ \
| * | | | | | | Add specMark Chao2018-05-241-22/+34
| * | | | | | | Avoid race condition of re-triggering mark_as_uncheckedMark Chao2018-05-181-2/+2
| * | | | | | | Plural reason(s)Mark Chao2018-05-184-5/+6
| * | | | | | | Create TODO when MR became unmergeablelulalala2018-05-176-53/+38
| * | | | | | | Notify with email when merge request became unmergeablelulalala2018-05-1712-0/+191
| * | | | | | | Add MergeRequest#merge_participantslulalala2018-05-172-0/+45
| * | | | | | | Add cannot_be_merged_recheck merge_statuslulalala2018-05-177-9/+62
| * | | | | | | Update doclulalala2018-05-171-0/+1
| * | | | | | | Update doc redirect linklulalala2018-05-171-1/+1
* | | | | | | | Merge branch 'jprovazn-fix-resolvable' into 'master'Douwe Maan2018-05-243-1/+14
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Check if note's noteable is not nil when checking resolvabilityjprovazn-fix-resolvableJan Provaznik2018-05-233-1/+14
* | | | | | | | Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master'Mike Greiling2018-05-243-1/+30
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |