summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | | | | Link correct project when adding file to empty MRBob Van Landuyt2018-03-071-1/+1
| * | | | | | | | | | | Use Project#source_of_merge_requests-relationBob Van Landuyt2018-03-071-1/+1
| * | | | | | | | | | | Limit queries to a user-branch combinationBob Van Landuyt2018-03-072-31/+32
| * | | | | | | | | | | Add documentation for allowing maintainers to pushBob Van Landuyt2018-03-071-0/+1
| * | | | | | | | | | | Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-0713-38/+70
| * | | | | | | | | | | Allow abilities on forks while MR is openBob Van Landuyt2018-03-072-0/+45
| * | | | | | | | | | | Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-0713-3/+91
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '39444-make-margin-around-dropdown-dividers-4px' into 'master'Clement Ho2018-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Set margins around dropdown dividers to 4px (based on grid)39444-make-margin-around-dropdown-dividers-4pxLukas Eipert2018-03-051-1/+1
* | | | | | | | | | | | Merge branch 'fix/reduce-number-of-find-commit-for-log-tree' into 'master'Robert Speicher2018-03-071-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Reduce number of FindCommit calls from RefsController#logs_treefix/reduce-number-of-find-commit-for-log-treeAhmad Sherif2018-03-061-2/+3
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '4326-fix-js-or-true' into 'master'Clement Ho2018-03-071-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix a JS bug in the websocket terminalNick Thomas2018-03-071-2/+8
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda2018-03-0715-101/+457
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestonesJose Ivan Vargas2018-03-0610-84/+33
| * | | | | | | | | | | Add persistent flash messagesJose Ivan Vargas2018-03-017-5/+71