summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Resolve "Mutual SSL Auth For Helm TIller"Mayra Cabrera2018-08-0734-178/+538
* Merge branch 'group-todos' into 'master'Sean McGivern2018-08-0743-262/+1036
|\
| * Add changes from the EEJarka Kadlecová2018-08-068-24/+33
| * Fix removing todos for users without accessJarka Kadlecová2018-08-067-79/+295
| * Remove group todos when a users looses accessJarka Kadlecová2018-08-028-18/+156
| * Don’t do authorisation checks for todosJarka Kadlecová2018-08-022-45/+0
| * Revert "Revert "Merge branch 'ee-5481-epic-todos' into 'master'""Jarka Kadlecová2018-08-0230-184/+640
* | Merge branch 'ce-rd-gitaly-client-for-list-new-objects-rpc' into 'master'Sean McGivern2018-08-078-10/+38
|\ \
| * | Backport some changes from gitlab-org/gitlab-ee!6767Rubén Dávila2018-08-078-10/+38
* | | Merge branch '49854-recover-mr-regression-fixes-safe' into 'master'Tim Zallmann2018-08-0723-122/+523
|\ \ \
| * | | Add changelogsAndré Luís2018-08-023-0/+15
| * | | Reapply "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'mast...André Luís2018-08-0110-68/+407
| * | | Reapply "Merge branch '_acet-fix-mr-autosave' into 'master'"André Luís2018-08-019-50/+101
| * | | Reapply "Merge branch '_acet-fix-expanding-context-lines' into 'master'"André Luís2018-08-013-4/+0
* | | | Merge branch 'gitaly-doc-standalone-server' into 'master'Sean McGivern2018-08-071-8/+30
|\ \ \ \
| * | | | Add omnibus setting examples for standalone gitaly serverJacob Vosmaer (GitLab)2018-08-071-8/+30
|/ / / /
* | | | Merge branch '48456-fix-system-level-labels-admin-ui' into 'master'Phil Hughes2018-08-077-18/+105
|\ \ \ \
| * | | | Resolve "System level labels UI broken"André Luís2018-08-077-18/+105
|/ / / /
* | | | Merge branch 'osw-fix-n-plus-1-for-mrs-without-merge-info' into 'master'Sean McGivern2018-08-073-11/+89
|\ \ \ \
| * | | | Avoid N+1 on MRs page when metrics merging date cannot be foundOswaldo Ferreira2018-08-063-11/+89
* | | | | Merge branch '36409-frontend-for-clarifying-the-usefulness-of-the-search-bar'...Phil Hughes2018-08-0713-430/+598
|\ \ \ \ \
| * | | | | Resolve "Frontend for clarifying the usefulness of the search bar"Dennis Tang2018-08-0713-430/+598
|/ / / / /
* | | | | Merge branch 'jr-fixup-ssh-cert-docs' into 'master'Nick Thomas2018-08-071-5/+3
|\ \ \ \ \
| * | | | | Fix typo and improve formattingJames Ramsay2018-08-061-5/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'git-rerere-link-doc-update' into 'master'Sean McGivern2018-08-072-1/+6
|\ \ \ \ \
| * | | | | Update git rerere link in docsgfyoung2018-08-072-1/+6
|/ / / / /
* | | | | Merge branch 'winh-user-status-docs' into 'master'Achilleas Pipinellis2018-08-071-0/+22
|\ \ \ \ \
| * | | | | Add documentation for setting up a user statusWinnie Hellmann2018-08-071-0/+22
|/ / / / /
* | | | | Merge branch 'tz-frontend-avatar-resizing' into 'master'Sean McGivern2018-08-0714-122/+136
|\ \ \ \ \
| * | | | | Send resize parameters for avatarsTim Zallmann2018-08-0714-122/+136
|/ / / / /
* | | | | Merge branch 'mg-backport-create-item-dropdown-changes' into 'master'Fatih Acet2018-08-062-2/+4
|\ \ \ \ \
| * | | | | Update CreateItemDropdown class to allow the glDropdown filterRemote optionMike Greiling2018-08-062-2/+4
|/ / / / /
* | | | | Merge branch '47156-improve-auto-devops-settings' into 'master'Clement Ho2018-08-0611-81/+138
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Resolve "Improve Auto DevOps settings flow for admin and project"Mike Greiling2018-08-0611-81/+138
|/ / / /
* | | | Merge branch 'sh-support-bitbucket-server-import' into 'master'Tim Zallmann2018-08-0640-28/+3799
|\ \ \ \
| * | | | Simplify importer_status.js failed status implementationStan Hu2018-08-061-3/+2
| * | | | Fix locale/gitlab.pot to use capital ImportStan Hu2018-08-031-1/+1
| * | | | Remove modal and standardize capsStan Hu2018-08-032-2/+1
| * | | | Use prepend to add margins to top of tableStan Hu2018-08-031-3/+1
| * | | | Remove date from author line since that is already present in `created_at`Stan Hu2018-08-032-2/+2
| * | | | Add a comment when user can't be identifiedStan Hu2018-08-022-6/+20
| * | | | Use a case statement to determine pull request stateStan Hu2018-08-021-2/+3
| * | | | Keep alignment in lib/gitlab/import_sources.rbStan Hu2018-08-021-9/+9
| * | | | Fix spec failures with app/helpers/namespaces_helper.rbStan Hu2018-08-011-6/+14
| * | | | Fix spec failures with namespace helpersStan Hu2018-08-011-2/+2
| * | | | Add I8N strings for Bitbucket Server importerStan Hu2018-08-011-0/+9
| * | | | Fix selection of existing project key by defaultStan Hu2018-08-012-6/+17
| * | | | Assorted Bitbucket Server importer code cleanup based on reviewStan Hu2018-08-014-11/+8
| * | | | Fix handling of non-existent groupsStan Hu2018-08-011-3/+3
| * | | | Improve localization and formatting of Bitbucket Server importer status pageStan Hu2018-08-011-9/+10