summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-0629-534/+595
|
* [ci skip] Fix conflictsFilipa Lacerda2018-01-051-28/+4
|
* Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-05218-1140/+3570
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (78 commits) Use --left-right and --max-count for counting diverging commits API: get participants from merge_requests & issues Copy Mermaid graphs as GFM Rephrase paragraph about e2e tests in merge requests in docs Remove EE only sections from docs Update redis-rack to 2.0.4 Refactor matchers for background migrations Add id to modal.vue to support data-toggle="modal" Allow local tests to use a modified Gitaly Fix specs Use computed prop in expand button Update check.md add deprecation and removal issue to docs Add status attribute to runner api entity Fix typos in a code comment Refactor RelativePositioning so that it can be used by other classes Backport 'Rebase' feature from EE to CE Just try to detect and assign once Fix custom name in branch creation for issue in Firefox Modify `LDAP::Person` to return username value based on attributes ...
| * Merge branch 'dm-copy-mermaid-as-gfm' into 'master'Jacob Schatz2018-01-056-14/+131
| |\ | | | | | | | | | | | | | | | | | | Copy Mermaid graphs as GFM Closes #41211 See merge request gitlab-org/gitlab-ce!16046
| | * Copy Mermaid graphs as GFMdm-copy-mermaid-as-gfmDouwe Maan2018-01-056-14/+131
| | |
| * | Merge branch '40622-use-left-right-and-max-count' into 'master'Rémy Coutable2018-01-057-17/+141
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Use --left-right and --max-count for counting diverging commits Closes #40622 et #37843 See merge request gitlab-org/gitlab-ce!15963
| | * | Use --left-right and --max-count for counting diverging commitsLin Jen-Shin (godfat)2018-01-057-17/+141
| |/ /
| * | Merge branch 'ce-backport=reorder-issues' into 'master'Sean McGivern2018-01-0512-61/+49
| |\ \ | | | | | | | | | | | | | | | | CE Backport of reordering issues in epics See merge request gitlab-org/gitlab-ce!16247
| | * | Refactor matchers for background migrationsce-backport=reorder-issuesJarka Kadlecová2018-01-0511-55/+33
| | | |
| | * | Refactor RelativePositioning so that it can be used by other classesJarka Kadlecová2018-01-052-7/+17
| | | |
| * | | Merge branch '41563-fix-branch-creation-from-issue-in-firefox' into 'master'Fatih Acet2018-01-051-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix custom name in branch creation for issue in Firefox Closes #41563 See merge request gitlab-org/gitlab-ce!16244
| | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2018-01-0560-349/+696
| | |\ \ \ | | | | | | | | | | | | | | | | | | 41563-fix-branch-creation-from-issue-in-firefox
| | * | | | Fix custom name in branch creation for issue in Firefox41563-fix-branch-creation-from-issue-in-firefoxEric Eastwood2018-01-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41563 `event.srcElement` is non-standard, https://developer.mozilla.org/en-US/docs/Web/API/Event/srcElement
| * | | | | Merge branch 'issues/40986/get-participants-from-issues-mr-api' into 'master'Rémy Coutable2018-01-058-0/+149
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: get participants from merge_requests & issues Closes #40986 See merge request gitlab-org/gitlab-ce!16187
| | * | | | | API: get participants from merge_requests & issuesBrent Greeff2018-01-058-0/+149
| | | | | | |
| * | | | | | Merge branch 'ac-autodevopfix-kubectl-version' into 'master'Kamil Trzciński2018-01-052-4/+13
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Create secrets failed for Auto DevOps with latest stable of kubectl" Closes #41376 See merge request gitlab-org/gitlab-ce!16218
| | * | | | | Backport gitlab-org/gitlab-ci-yml!128 - Fix kubectl version to 1.8.6ac-autodevopfix-kubectl-versionAlessio Caiazza2018-01-042-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit extracts `kubectl`, `helm` and `codeclimate` versions as CI variables. `kubectl` changes from latest stable version to `1.8.6`, the other two are just extracted in order to be easily updated; now we can also test tool upgrades overriding CI secret variables.
| * | | | | | Merge branch 'jprovazn-rebase' into 'master'Filipa Lacerda2018-01-0539-13/+820
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport 'Rebase' feature from EE to CE Closes #40301 See merge request gitlab-org/gitlab-ce!16071
| | * | | | | | Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-0540-13/+825
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
| * | | | | | Merge branch 'remove-project-repo' into 'master'Sean McGivern2018-01-057-17/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the Project#repo method See merge request gitlab-org/gitlab-ce!16238
| | * | | | | | Fix specsremove-project-repoJacob Vosmaer2018-01-055-11/+15
| | | | | | | |
| | * | | | | | Remove the Project#repo methodJacob Vosmaer2018-01-042-6/+2
| | | | | | | |
| * | | | | | | Merge branch 'docs/qa/gb/document-integration-tests-in-merge-requests' into ↵Rémy Coutable2018-01-053-0/+91
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add docs about end-to-end testing / GitLab QA tests Closes #39637 See merge request gitlab-org/gitlab-ce!16043
| | * | | | | | | Rephrase paragraph about e2e tests in merge requests in docsGrzegorz Bizon2018-01-051-8/+6
| | | | | | | | |
| | * | | | | | | Copy-edit end-to-end testing guide documentationdocs/qa/gb/document-integration-tests-in-merge-requestsGrzegorz Bizon2018-01-041-16/+18
| | | | | | | | |
| | * | | | | | | Fix link to end-to-end testing docs from test pyramidGrzegorz Bizon2018-01-021-1/+1
| | | | | | | | |
| | * | | | | | | Copy-edit end-to-end testing guidelinesGrzegorz Bizon2018-01-021-13/+18
| | | | | | | | |
| | * | | | | | | Link to end to end test guideline from test pyramidGrzegorz Bizon2018-01-021-0/+3
| | | | | | | | |
| | * | | | | | | Extend documentation on end-to-end integration testsGrzegorz Bizon2018-01-022-9/+42
| | | | | | | | |
| | * | | | | | | Add docs about end-to-end testing / GitLab QA testsGrzegorz Bizon2018-01-022-0/+50
| | | | | | | | |
| * | | | | | | | Merge branch 'api-domains-expose-project_id' into 'master'Dmitriy Zaporozhets2018-01-055-1/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose project_id on /api/v4/pages/domains See merge request gitlab-org/gitlab-ce!16200
| | * | | | | | | | Expose project_id on /api/v4/pages/domainsLuc Didry2018-01-035-1/+10
| | | | | | | | | |
| * | | | | | | | | Merge branch 'ban-disk-import' into 'master'Sean McGivern2018-01-053-1/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use Gitlab::Shell#import_repository on local paths See merge request gitlab-org/gitlab-ce!16228
| | * | | | | | | | | rubocopban-disk-importJacob Vosmaer2018-01-041-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Hide hooks stuffJacob Vosmaer2018-01-042-3/+2
| | | | | | | | | | |
| | * | | | | | | | | get it workingJacob Vosmaer2018-01-043-1/+11
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'backport-issue_3413' into 'master'Sean McGivern2018-01-0516-248/+516
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [EE-backport] Add group boards API endpoint See merge request gitlab-org/gitlab-ce!16194
| | * | | | | | | | | Remove EE only sections from docsbackport-issue_3413Felipe Artur2018-01-051-85/+0
| | | | | | | | | | |
| | * | | | | | | | | EE-BACKPORT group boardsFelipe Artur2018-01-0416-248/+601
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'ce-4348-show-dast-results-in-the-mr-widget' into 'master'Tim Zallmann2018-01-054-0/+97
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of methods and components added in EE See merge request gitlab-org/gitlab-ce!16208
| | * | | | | | | | | Use computed prop in expand buttonce-4348-show-dast-results-in-the-mr-widgetFilipa Lacerda2018-01-051-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Backport of methods and components added in EBackport of methods and ↵Filipa Lacerda2018-01-034-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | components added in EEE
| * | | | | | | | | | Merge branch 'update-redis-rack' into 'master'Rémy Coutable2018-01-052-1/+6
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update redis-rack to 2.0.4 See merge request gitlab-org/gitlab-ce!16251
| | * | | | | | | | | | Update redis-rack to 2.0.4update-redis-rackYorick Peterse2018-01-052-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up until version 2.0.3 redis-rack included a "rake" binary that would overwrite/hijack the one provided by Rake itself. Unfortunately the binary provided by redis-rack would produce errors in many cases. See https://github.com/redis-store/redis-rack/pull/34 for more info.
| * | | | | | | | | | | Merge branch 'master' into 'master'Rémy Coutable2018-01-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update settings.md See merge request gitlab-org/gitlab-ce!16233
| | * | | | | | | | | | Update settings.mdGauthier Wallet2018-01-041-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'jivl-fix-import-project-url-bug' into 'master'Tim Zallmann2018-01-053-17/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import project url not updating project name Closes #40607 See merge request gitlab-org/gitlab-ce!16120
| | * | | | | | | | | | | Fix import project url not updating project namejivl-fix-import-project-url-bugJose Ivan Vargas2018-01-033-17/+27
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'winh-modal-target-id' into 'master'Filipa Lacerda2018-01-0515-115/+168
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add id to modal.vue to support data-toggle="modal" Closes #41584 See merge request gitlab-org/gitlab-ce!16189
| | * | | | | | | | | | Add id to modal.vue to support data-toggle="modal"Winnie Hellmann2018-01-0515-115/+168
| | | | | | | | | | | |
View Lorry Controller Status