summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add permissions guide to the development doc50036-document-permissionsJarka Kadlecová2018-08-092-0/+53
* 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
| * | Remove extra space in app/controllers/import/bitbucket_server_controller.rbStan Hu2018-08-011-1/+1
| * | Inline repo_owner in app/controllers/import/bitbucket_server_controller.rbStan Hu2018-08-011-3/+1
| * | Properly fallback to current user in namespaces helperStan Hu2018-07-311-0/+2
| * | Fix failing spec in ./spec/features/projects/new_project_spec.rbStan Hu2018-07-311-8/+10
| * | Deal with subpaths and trailing slashes properlyStan Hu2018-07-312-7/+25
| * | Revert "Remove unnecessary lookup for merge request SHAs"Stan Hu2018-07-311-2/+7
| * | Fix failing spec in fallback diff note changeStan Hu2018-07-312-5/+2
| * | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-317-8/+18
| |\ \
| * | | Improve formatting of fallback diff noteStan Hu2018-07-311-1/+6
| * | | Remove unnecessary lookup for merge request SHAsStan Hu2018-07-311-7/+2
| * | | Fix bug where fallback diff notes would not have an associated positionStan Hu2018-07-312-7/+17
| * | | Handle empty description fieldStan Hu2018-07-311-1/+1
| * | | Use URI.join to avoid slash headachesStan Hu2018-07-311-3/+3
| * | | Hide error details if there are noneStan Hu2018-07-311-1/+1
| * | | Convert Bitbucket field to password fieldStan Hu2018-07-311-1/+1
| * | | Default to importing to the current project keyStan Hu2018-07-313-5/+29
| * | | Fix namespaces_helper reporting multiple groupsStan Hu2018-07-312-2/+14