summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Maintain centering for picture avatars64068-picture-and-text-misaligned-in-namespace-selection-buttonsThomas Randolph2019-08-122-0/+17
|
* Merge branch 'georgekoltsov/51260-add-filtering-to-bitbucket-server-import' ↵Tim Zallmann2019-08-1210-8/+53
|\ | | | | | | | | | | | | into 'master' Add BitBucketServerImport project filtering See merge request gitlab-org/gitlab-ce!31420
| * 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 ↵Thong Kuah2019-08-123-2/+10
|\ \ | | | | | | | | | | | | | | | | | | 'master' Fix :wiki_can_not_be_created_total counter See merge request gitlab-org/gitlab-ce!31673
| * | 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 text in docs See merge request gitlab-org/gitlab-ce!31412
| * | | 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 ↵Kushal Pandya2019-08-124-31/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Web IDE MR/branch dropdown closes unexpectedly" Closes #61332 See merge request gitlab-org/gitlab-ce!31523
| * | | | Reduce the default height of MR/branch dropdowns61332-web-ide-mr-branch-dropdown-closes-unexpectedlyHimanshu Kapoor2019-08-093-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid having empty areas in the dropdown that occupy unnessary space, I removed the dropdown's min-height and changed its default height in empty state to be same as its loading state (with the spinner).
| * | | | Focus on the input when clicked outside the inputHimanshu Kapoor2019-08-094-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed in MR list and branch list components. Earlier clicking right outside the input box closed the dropdown, which was unexpected behaviour. To make it consistent with the behaviour of select2 jquery plugin, I have made clicking outside the input focus on the input by using a label.
* | | | | Merge branch 'docs-civariables-mr' into 'master'Achilleas Pipinellis2019-08-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: CI predefined variables: push request -> MR See merge request gitlab-org/gitlab-ce!31711
| * | | | | CI predefined variables: push request -> MRStefan Schmalzhaf2019-08-121-1/+1
| | | | | |
* | | | | | Merge branch 'jenkins-update-docs' into 'master'Achilleas Pipinellis2019-08-121-0/+28
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Add Groovy vs. YAML section to CI Jenkins doc See merge request gitlab-org/gitlab-ce!31601
| * | | | | Merge deploy keys example to deploy keys API docsJason Lenny2019-08-121-0/+28
|/ / / / / | | | | | | | | | | | | | | | No reason to keep them separate.
* | | | | Merge branch 'docs-image-alignment-2' into 'master'Achilleas Pipinellis2019-08-1216-125/+119
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown spacing in various docs (part 4) See merge request gitlab-org/gitlab-ce!31710
| * | | | | Fix markdown spacing in various docsMarcel Amirault2019-08-1216-125/+119
|/ / / / / | | | | | | | | | | | | | | | Align images and lists in assorted markdown docs
* | | | | Merge branch 'docs-image-alignment' into 'master'Achilleas Pipinellis2019-08-1214-103/+108
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown spacing in various docs (part 3) See merge request gitlab-org/gitlab-ce!31709
| * | | | | Fix markdown spacing in various docsMarcel Amirault2019-08-1214-103/+108
|/ / / / / | | | | | | | | | | | | | | | Align images and lists in assorted markdown docs
* | | | | Merge branch 'docs/consistent-section-headings' into 'master'Achilleas Pipinellis2019-08-126-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make section headings consistent See merge request gitlab-org/gitlab-ce!31703
| * | | | | Make section headings consistentEvan Read2019-08-126-7/+7
|/ / / / /
* | | | | Merge branch ↵docs-4453-external-exportersFilipa Lacerda2019-08-123-48/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie' into 'master' Fix incorrectly displayed conflict warning See merge request gitlab-org/gitlab-ce!31469
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Hide warning when update request is in progress
* | | | | | Merge branch 'sh-break-out-invited-group-members' into 'master'Ash McKenzie2019-08-1215-54/+163
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it easier to find invited group members Closes #61948 See merge request gitlab-org/gitlab-ce!28436
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update PO file
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3af747657083e2d91922cdb9be5879f890ca50bb.
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The parameters needed `html_safe` as well.
| * | | | | | Merge branch 'master' into sh-break-out-invited-group-membersStan Hu2019-08-09624-2666/+6688
| |\ \ \ \ \ \
| * | | | | | | Resolve more discussionMartin Wortschack2019-08-092-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add placeholder for tags in translation - Update PO file
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoid splitting sentences - Update PO file - Utilize $input-height - Replace pr- with mr-
| * | | | | | | Merge branch 'master' into sh-break-out-invited-group-membersStan Hu2019-08-07307-1608/+4305
| |\ \ \ \ \ \ \
| * | | | | | | | Remove local varMartin Wortschack2019-08-061-2/+0
| | | | | | | | |
| * | | | | | | | Fix broken specsMartin Wortschack2019-08-066-27/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Add qa- selector to sort dropdown
| * | | | | | | | Fix CSS for mobileMartin Wortschack2019-08-064-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Externalize strings - Update PO file
| * | | | | | | | Replace some flex propertiesGeorge Tsiolis2019-08-053-8/+8
| | | | | | | | |
| * | | | | | | | Remove card borderGeorge Tsiolis2019-08-051-2/+2
| | | | | | | | |
| * | | | | | | | Fix CSS for pending listStan Hu2019-08-051-1/+1
| | | | | | | | |
| * | | | | | | | Minor UX tweaks based on feedbackStan Hu2019-08-053-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show the pending page if user searches for an invited user. Remove the sort in the pending page to avoid confusion.
| * | | | | | | | Fix spec for inviting membersStan Hu2019-08-051-0/+2
| | | | | | | | |
View Lorry Controller Status