summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ce-5194-fix-github-ci-cd-github-auth-missing-query-param' into ...Douwe Maan2018-03-091-1/+1
|\
| * Backport fix new GitHub CI/CD page redirecting to import GitHub status pagece-5194-fix-github-ci-cd-github-auth-missing-query-paramEric Eastwood2018-03-081-1/+1
* | Merge branch 'merge-request-widget-source-branch-improvements' into 'master'Filipa Lacerda2018-03-094-3/+47
|\ \
| * | Dont show remove source branch checkbox when user cannot remove the branchPhil Hughes2018-03-084-3/+47
| |/
* | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-092-81/+3
|\ \
| * | Cache `#can_be_resolved_in_ui?` git operationscache-refactorAlejandro Rodríguez2018-03-081-9/+1
| * | Refactor RepositoryCache to make it usable in other classesAlejandro Rodríguez2018-03-061-72/+2
* | | Merge branch 'fl-svg' into 'master'Clement Ho2018-03-0817-3/+17
|\ \ \
| * | | Update svgs contentfl-svgFilipa Lacerda2018-03-0817-3/+17
* | | | Merge branch '37211-diff-comments-fix-ctrl-enter-tooltip' into 'master'Fatih Acet2018-03-081-1/+1
|\ \ \ \
| * | | | Hide hotkey tooltip after click event in diff comments37211-diff-comments-fix-ctrl-enter-tooltipDennis Tang2018-03-061-1/+1
* | | | | Merge branch 'refactor/move-mr-widget-memory-usage-and-graph-components' into...Phil Hughes2018-03-083-55/+78
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move MemoryGraph and MemoryUsage vue componentsGeorge Tsiolis2018-03-083-55/+78
* | | | | Merge branch 'jivl-fix-delete-milestone-button-showing-up' into 'master'Phil Hughes2018-03-081-10/+10
|\ \ \ \ \
| * | | | | Fix milestone delete button showing for all usersjivl-fix-delete-milestone-button-showing-upJose Ivan Vargas2018-03-061-10/+10
* | | | | | Fix Error 500 when updating a projectsh-fix-update-serviceStan Hu2018-03-081-1/+1
* | | | | | Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse2018-03-082-8/+41
|\ \ \ \ \ \
| * | | | | | Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeoutsAndreas Brandl2018-03-072-8/+41
* | | | | | | Merge branch 'jprovazn-revert-commit-cleanup' into 'master'Sean McGivern2018-03-081-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Revert "Cleanup after adding MR diff's commit_count"Jan Provaznik2018-03-081-0/+4
* | | | | | | | [CE] Add Naming/FileName rule checking expected class/module per filenameGabriel Mazetto2018-03-081-0/+0
|/ / / / / / /
* | | | | | | Merge branch 'sh-remove-double-caching-repo-empty' into 'master'Sean McGivern2018-03-081-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Memoize Repository#empty? instead of double caching the valuesh-remove-double-caching-repo-emptyStan Hu2018-03-071-3/+5
* | | | | | | | Merge branch '43770-change-clear-runners-cache-ujs-action-to-an-axios-request...Kamil Trzciński2018-03-084-14/+50
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-0746-181/+673
| |\ \ \ \ \ \ \
| * | | | | | | | Removes UJS from reset cache buttonFilipa Lacerda2018-03-073-10/+44
| * | | | | | | | [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-0788-412/+924
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-06254-4327/+1957
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make Projects::Settings:CiCdController#reset_cache a json endpointMatija Čupić2018-03-011-4/+6
* | | | | | | | | | | Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-084-14/+37
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Hides Triggers if integration only has one eventJames Edwards-Jones2018-03-082-2/+13
| * | | | | | | | | | | Service integration displays validation errors on test failJames Edwards-Jones2018-03-071-12/+16
| * | | | | | | | | | | Backport changes from EE's GithubService integrationJames Edwards-Jones2018-03-072-0/+8
* | | | | | | | | | | | Merge branch 'unassign-when-leaving' into 'master'Robert Speicher2018-03-084-57/+30
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leavingDouwe Maan2018-03-074-57/+30
* | | | | | | | | | | | | Address frontend feedbackBob Van Landuyt2018-03-082-3/+3
* | | | | | | | | | | | | Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'Filipa Lacerda2018-03-075-31/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontendJose Ivan Vargas2018-03-075-31/+59
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'da-update-project-activity' into 'master'Stan Hu2018-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update project activity when pushing to a wiki repositoryda-update-project-activityDouglas Barbosa Alexandre2018-03-071-1/+1
* | | | | | | | | | | | | | Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'Douwe Maan2018-03-077-48/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-feDouwe Maan2018-03-0748-153/+691
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | CE backport for creating CI/CD projects from GitHubRubén Dávila2018-03-077-48/+105
* | | | | | | | | | | | | | | | Merge branch 'backport-ee-3892-to-ce' into 'master'Douwe Maan2018-03-072-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/mer...backport-ee-3892-to-ceTiago Botelho2018-03-072-0/+11
* | | | | | | | | | | | | | | | | Merge branch 'refactor/move-sidebar-assignee-vue-component' into 'master'Clement Ho2018-03-072-44/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Move SidebarAssignees vue componentGeorge Tsiolis2018-03-072-44/+47
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Resolve "Add a mention and link to doc for security implications in the Kuber...Mayra Cabrera2018-03-071-0/+6
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-0727-44/+219
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Only allow users that can merge to push to sourcebvl-allow-maintainer-to-pushBob Van Landuyt2018-03-072-3/+11