summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update Gitaly server and gem to 1.58.0Jacob Vosmaer2019-08-125-44/+5
* Merge branch 'georgekoltsov/63408-user-mapping' into 'master'Grzegorz Bizon2019-08-1210-21/+55
|\
| * Add code review suggestionsGeorge Koltsov2019-08-121-4/+4
| * Apply code review feedbackGeorge Koltsov2019-08-084-16/+13
| * Update project/import/bitbucket.md docGeorge Koltsov2019-08-071-5/+5
| * Add bitbucket_import/importer_spec.rb specGeorge Koltsov2019-08-074-11/+34
| * Add changelog entryGeorge Koltsov2019-08-071-0/+6
| * Add author lines to project import commentsGeorge Koltsov2019-08-074-5/+13
* | Merge branch 'sh-update-ruby-labkit' into 'master'Robert Speicher2019-08-122-4/+4
|\ \
| * | Update gitlab-labkit to 0.4.2sh-update-ruby-labkitStan Hu2019-08-102-4/+4
* | | Merge branch 'georgekoltsov/51260-add-filtering-to-bitbucket-server-import' i...Tim Zallmann2019-08-1210-8/+53
|\ \ \
| * | | Add filter param sanitizationgeorgekoltsov/51260-add-filtering-to-bitbucket-server-importGeorge Koltsov2019-08-123-4/+10
| * | | Update import/bitbucket_server.md docsGeorge Koltsov2019-08-123-2/+4
| * | | Add BitbucketServerController filtering specGeorge Koltsov2019-08-122-2/+14
| * | | Add bitbucket_server/client_spec.rb specGeorge Koltsov2019-08-121-0/+11
| * | | Add i18n stringsGeorge Koltsov2019-08-121-0/+3
| * | | Add changelog entryGeorge Koltsov2019-08-124-8/+14
| * | | Add BitBucketServerImport project filteringGeorge Koltsov2019-08-123-2/+7
* | | | Merge branch 'alipniagov-fix-wiki_can_not_be_created_total-counter' into 'mas...Thong Kuah2019-08-123-2/+10
|\ \ \ \
| * | | | Fix :wiki_can_not_be_created_total counteralipniagov-fix-wiki_can_not_be_created_total-counterAleksei Lipniagov2019-08-093-2/+10
* | | | | Merge branch 'docs-correct-new-branch-text-instead-of-lorem-ipsum' into 'master'Achilleas Pipinellis2019-08-121-1/+1
|\ \ \ \ \
| * | | | | Replace Lorem Ipsum with actual screenshot textdocs-correct-new-branch-text-instead-of-lorem-ipsumRene Verschoor2019-08-021-1/+1
* | | | | | Merge branch '61332-web-ide-mr-branch-dropdown-closes-unexpectedly' into 'mas...Kushal Pandya2019-08-124-31/+31
|\ \ \ \ \ \
| * | | | | | Reduce the default height of MR/branch dropdowns61332-web-ide-mr-branch-dropdown-closes-unexpectedlyHimanshu Kapoor2019-08-093-7/+6
| * | | | | | Focus on the input when clicked outside the inputHimanshu Kapoor2019-08-094-28/+29
* | | | | | | Merge branch 'docs-civariables-mr' into 'master'Achilleas Pipinellis2019-08-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | CI predefined variables: push request -> MRStefan Schmalzhaf2019-08-121-1/+1
* | | | | | | | Merge branch 'jenkins-update-docs' into 'master'Achilleas Pipinellis2019-08-121-0/+28
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge deploy keys example to deploy keys API docsJason Lenny2019-08-121-0/+28
|/ / / / / / /
* | | | | | | Merge branch 'docs-image-alignment-2' into 'master'Achilleas Pipinellis2019-08-1216-125/+119
|\ \ \ \ \ \ \
| * | | | | | | Fix markdown spacing in various docsMarcel Amirault2019-08-1216-125/+119
|/ / / / / / /
* | | | | | | Merge branch 'docs-image-alignment' into 'master'Achilleas Pipinellis2019-08-1214-103/+108
|\ \ \ \ \ \ \
| * | | | | | | Fix markdown spacing in various docsMarcel Amirault2019-08-1214-103/+108
|/ / / / / / /
* | | | | | | Merge branch 'docs/consistent-section-headings' into 'master'Achilleas Pipinellis2019-08-126-7/+7
|\ \ \ \ \ \ \
| * | | | | | | Make section headings consistentEvan Read2019-08-126-7/+7
|/ / / / / / /
* | | | | | | Merge branch '44036-someone-edited-the-issue-at-the-same-time-is-regularly-se...docs-4453-external-exportersFilipa Lacerda2019-08-123-48/+73
|\ \ \ \ \ \ \
| * | | | | | | Fix conflict warning being incorrectly displayed44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lieHeinrich Lee Yu2019-08-123-48/+73
* | | | | | | | Merge branch 'sh-break-out-invited-group-members' into 'master'Ash McKenzie2019-08-1215-54/+163
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve spec description in member_spec.rbsh-break-out-invited-group-membersStan Hu2019-08-111-1/+1
| * | | | | | | | Use snake case for tag placeholdersMartin Wortschack2019-08-092-6/+6
| * | | | | | | | Fixing missing html_safe calls for pending listStan Hu2019-08-091-1/+1
| * | | | | | | | Revert "Change 'data-toggle' => 'tab' to data-toggle: 'tab'"Stan Hu2019-08-091-2/+2
| * | | | | | | | Change 'data-toggle' => 'tab' to data-toggle: 'tab'Stan Hu2019-08-091-2/+2
| * | | | | | | | Fix typo in causing failing to test in sorting_spec.rbStan Hu2019-08-091-1/+1
| * | | | | | | | Fix highlighting of group name not workingStan Hu2019-08-091-2/+2
| * | | | | | | | Merge branch 'master' into sh-break-out-invited-group-membersStan Hu2019-08-09624-2666/+6688
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Resolve more discussionMartin Wortschack2019-08-092-5/+5
| * | | | | | | | | Apply suggestion to app/views/groups/group_members/index.html.hamlMartin Wortschack2019-08-091-1/+1
| * | | | | | | | | Rename search_invited to search_invite_emailStan Hu2019-08-093-4/+6
| * | | | | | | | | Resolve first round of discussionsMartin Wortschack2019-08-083-14/+11