Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '40525-listing-user-activity-timeouts' into 'master' | Yorick Peterse | 2018-03-08 | 2 | -8/+41 |
|\ | |||||
| * | Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeouts | Andreas Brandl | 2018-03-07 | 2 | -8/+41 |
* | | Merge branch 'jprovazn-revert-commit-cleanup' into 'master' | Sean McGivern | 2018-03-08 | 1 | -0/+4 |
|\ \ | |||||
| * | | Revert "Cleanup after adding MR diff's commit_count" | Jan Provaznik | 2018-03-08 | 1 | -0/+4 |
* | | | [CE] Add Naming/FileName rule checking expected class/module per filename | Gabriel Mazetto | 2018-03-08 | 1 | -0/+0 |
|/ / | |||||
* | | Merge branch 'sh-remove-double-caching-repo-empty' into 'master' | Sean McGivern | 2018-03-08 | 1 | -3/+5 |
|\ \ | |||||
| * | | Memoize Repository#empty? instead of double caching the valuesh-remove-double-caching-repo-empty | Stan Hu | 2018-03-07 | 1 | -3/+5 |
* | | | Merge branch '43770-change-clear-runners-cache-ujs-action-to-an-axios-request... | Kamil Trzciński | 2018-03-08 | 4 | -14/+50 |
|\ \ \ | |||||
| * \ \ | [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act... | Filipa Lacerda | 2018-03-07 | 46 | -181/+673 |
| |\ \ \ | |||||
| * | | | | Removes UJS from reset cache button | Filipa Lacerda | 2018-03-07 | 3 | -10/+44 |
| * | | | | [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act... | Filipa Lacerda | 2018-03-07 | 88 | -412/+924 |
| |\ \ \ \ | |||||
| * \ \ \ \ | [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act... | Filipa Lacerda | 2018-03-06 | 254 | -4327/+1957 |
| |\ \ \ \ \ | |||||
| * | | | | | | Make Projects::Settings:CiCdController#reset_cache a json endpoint | Matija Čupić | 2018-03-01 | 1 | -4/+6 |
* | | | | | | | Merge branch 'ce-jej/github-project-service-for-ci' into 'master' | Douwe Maan | 2018-03-08 | 4 | -14/+37 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Hides Triggers if integration only has one event | James Edwards-Jones | 2018-03-08 | 2 | -2/+13 |
| * | | | | | | | Service integration displays validation errors on test fail | James Edwards-Jones | 2018-03-07 | 1 | -12/+16 |
| * | | | | | | | Backport changes from EE's GithubService integration | James Edwards-Jones | 2018-03-07 | 2 | -0/+8 |
* | | | | | | | | Merge branch 'unassign-when-leaving' into 'master' | Robert Speicher | 2018-03-08 | 4 | -57/+30 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leaving | Douwe Maan | 2018-03-07 | 4 | -57/+30 |
* | | | | | | | | | Address frontend feedback | Bob Van Landuyt | 2018-03-08 | 2 | -3/+3 |
* | | | | | | | | | Merge branch 'jivl-backport-custom-metrics-frontend' into 'master' | Filipa Lacerda | 2018-03-07 | 5 | -31/+59 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontend | Jose Ivan Vargas | 2018-03-07 | 5 | -31/+59 |
* | | | | | | | | | | Merge branch 'da-update-project-activity' into 'master' | Stan Hu | 2018-03-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update project activity when pushing to a wiki repositoryda-update-project-activity | Douglas Barbosa Alexandre | 2018-03-07 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master' | Douwe Maan | 2018-03-07 | 7 | -48/+105 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-fe | Douwe Maan | 2018-03-07 | 48 | -153/+691 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | CE backport for creating CI/CD projects from GitHub | Rubén Dávila | 2018-03-07 | 7 | -48/+105 |
* | | | | | | | | | | | | | Merge branch 'backport-ee-3892-to-ce' into 'master' | Douwe Maan | 2018-03-07 | 2 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/mer...backport-ee-3892-to-ce | Tiago Botelho | 2018-03-07 | 2 | -0/+11 |
* | | | | | | | | | | | | | | Merge branch 'refactor/move-sidebar-assignee-vue-component' into 'master' | Clement Ho | 2018-03-07 | 2 | -44/+47 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Move SidebarAssignees vue component | George Tsiolis | 2018-03-07 | 2 | -44/+47 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Resolve "Add a mention and link to doc for security implications in the Kuber... | Mayra Cabrera | 2018-03-07 | 1 | -0/+6 |
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'bvl-allow-maintainer-to-push' into 'master' | Douwe Maan | 2018-03-07 | 27 | -44/+219 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Only allow users that can merge to push to sourcebvl-allow-maintainer-to-push | Bob Van Landuyt | 2018-03-07 | 2 | -3/+11 |
| * | | | | | | | | | | | Link correct project when adding file to empty MR | Bob Van Landuyt | 2018-03-07 | 1 | -1/+1 |
| * | | | | | | | | | | | Use Project#source_of_merge_requests-relation | Bob Van Landuyt | 2018-03-07 | 1 | -1/+1 |
| * | | | | | | | | | | | Limit queries to a user-branch combination | Bob Van Landuyt | 2018-03-07 | 2 | -31/+32 |
| * | | | | | | | | | | | Add documentation for allowing maintainers to push | Bob Van Landuyt | 2018-03-07 | 1 | -0/+1 |
| * | | | | | | | | | | | Allow maintainers to edit directly in a fork | Bob Van Landuyt | 2018-03-07 | 13 | -38/+70 |
| * | | | | | | | | | | | Allow abilities on forks while MR is open | Bob Van Landuyt | 2018-03-07 | 2 | -0/+45 |
| * | | | | | | | | | | | Allow a user to select `allow maintainer to push` | Bob Van Landuyt | 2018-03-07 | 13 | -3/+91 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '39444-make-margin-around-dropdown-dividers-4px' into 'master' | Clement Ho | 2018-03-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Set margins around dropdown dividers to 4px (based on grid)39444-make-margin-around-dropdown-dividers-4px | Lukas Eipert | 2018-03-05 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'fix/reduce-number-of-find-commit-for-log-tree' into 'master' | Robert Speicher | 2018-03-07 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Reduce number of FindCommit calls from RefsController#logs_treefix/reduce-number-of-find-commit-for-log-tree | Ahmad Sherif | 2018-03-06 | 1 | -2/+3 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch '4326-fix-js-or-true' into 'master' | Clement Ho | 2018-03-07 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix a JS bug in the websocket terminal | Nick Thomas | 2018-03-07 | 1 | -2/+8 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jivl-new-modal-project-labels-milestones' into 'master' | Filipa Lacerda | 2018-03-07 | 15 | -101/+457 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestones | Jose Ivan Vargas | 2018-03-06 | 10 | -84/+33 |
| * | | | | | | | | | | | Add persistent flash messages | Jose Ivan Vargas | 2018-03-01 | 7 | -5/+71 |