summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-ut...Stan Hu2018-03-232-7/+50
* Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'Robert Speicher2018-03-231-0/+5
* Merge branch 'fix-ci-job-auto-retry' into 'master'Grzegorz Bizon2018-03-231-0/+29
* Merge branch 'fix/sm/erase_old_trace' into 'master'Kamil Trzciński2018-03-231-0/+22
* Merge branch 'sh-admin-projects-remove-n-plus-one' into 'master'Robert Speicher2018-03-191-0/+10
* Merge branch 'profile-notifications-dropdown-fix' into 'master'Filipa Lacerda2018-03-191-1/+1
* Merge branch 'fix-dropzone-project-show' into 'master'Jacob Schatz2018-03-191-0/+22
* Merge branch 'sh-cache-table-exists' into 'master'Yorick Peterse2018-03-191-0/+12
* Merge branch 'sh-cache-column-exists' into 'master'Yorick Peterse2018-03-191-0/+11
* Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master'Kamil Trzciński2018-03-193-1/+49
* Merge remote-tracking branch 'dev/10-6-stable' into 10-6-stable-prepare-rc7James Lopez2018-03-1912-66/+275
|\
| * Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'James Lopez2018-03-162-43/+82
| * Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-168-8/+191
| * Revert "Merge branch '35475-lazy-diff' into 'master'"James Lopez2018-03-162-15/+2
* | Merge branch 'ci-lint-dispatcher-fix' into 'master'Filipa Lacerda2018-03-161-0/+1
* | Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'Robert Speicher2018-03-162-23/+93
* | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-165-103/+158
|/
* Merge branch '35475-lazy-diff' into 'master'10-6-stable-prepare-rc5Fatih Acet2018-03-142-2/+15
* Merge branch '44149-issue-comment-buttons' into 'master'Phil Hughes2018-03-133-0/+96
* Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'Nick Thomas2018-03-131-2/+14
* Merge branch 'tc-api-fix-expose_url' into 'master'Stan Hu2018-03-131-0/+41
* Merge branch 'fix-duplicate-notes' into 'master'Filipa Lacerda2018-03-133-3/+79
* Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-131-11/+29
* Merge branch 'sh-remove-double-caching-repo-empty' into 'master'Sean McGivern2018-03-131-2/+0
* Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse2018-03-131-1/+0
* Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes2018-03-132-13/+13
* Merge branch 'sh-fix-update-service' into 'master'James Lopez2018-03-081-0/+9
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 10-6-stable-frozenJames Lopez2018-03-0854-642/+1571
|\
| * Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-083-0/+48
| |\
| | * Hides Triggers if integration only has one eventJames Edwards-Jones2018-03-081-0/+35
| | * Service integration displays validation errors on test failJames Edwards-Jones2018-03-071-0/+12
| | * Backport changes from EE's GithubService integrationJames Edwards-Jones2018-03-071-0/+1
| * | Merge branch 'unassign-when-leaving' into 'master'Robert Speicher2018-03-082-59/+60
| |\ \
| | * | Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leavingDouwe Maan2018-03-072-59/+60
| * | | Address frontend feedbackBob Van Landuyt2018-03-081-8/+25
| * | | Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'Filipa Lacerda2018-03-071-1/+1
| |\ \ \
| | * | | backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontendJose Ivan Vargas2018-03-071-1/+1
| * | | | Merge branch 'da-update-project-activity' into 'master'Stan Hu2018-03-071-0/+12
| |\ \ \ \
| | * | | | Update project activity when pushing to a wiki repositoryda-update-project-activityDouglas Barbosa Alexandre2018-03-071-0/+12
| * | | | | Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'Douwe Maan2018-03-072-7/+12
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-feDouwe Maan2018-03-0723-35/+672
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | CE backport for creating CI/CD projects from GitHubRubén Dávila2018-03-072-7/+12
| * | | | | | Merge branch 'refactor/move-sidebar-assignee-vue-component' into 'master'Clement Ho2018-03-071-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Move SidebarAssignees vue componentGeorge Tsiolis2018-03-071-1/+1
| * | | | | | Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-0719-5/+497
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Only allow users that can merge to push to sourcebvl-allow-maintainer-to-pushBob Van Landuyt2018-03-072-12/+22
| | * | | | | Limit queries to a user-branch combinationBob Van Landuyt2018-03-074-30/+70
| | * | | | | Set `allow_maintainer_to_push` using the APIBob Van Landuyt2018-03-072-1/+30
| | * | | | | Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-074-2/+63
| | * | | | | Allow maintainers to push to a single branchBob Van Landuyt2018-03-071-0/+35