summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Extract EE specific files/lines for some app/views/shared/members/_member.htm...ce-6357-extract-ee-specific-files-lines-for-some-app-views-shared-members-_member-html-hamlDennis Tang2019-05-081-0/+10
* Remove non-semantic use of `.row` in member listing controlsce-11542-remove-non-semantic-use-of-row-in-member-listing-controlsDennis Tang2019-05-082-1/+6
* Merge branch '6361-move-ee-notify-text-haml' into 'master'Phil Hughes2019-05-081-0/+2
|\
| * CE: Fixes EE differences for6361-move-ee-notify-text-hamlDonald Cook2019-05-071-0/+2
* | Merge branch '58404-set-default-max-depth-for-GraphQL' into 'master'Sean McGivern2019-05-085-44/+135
|\ \
| * | 58404 - setup max depth for graphqlKen Ding2019-05-075-44/+135
* | | Merge branch 'fe-header-row' into 'master'Phil Hughes2019-05-087-28/+61
|\ \ \
| * | | Adds header column to variables listfe-header-rowFilipa Lacerda2019-05-077-28/+61
* | | | Merge branch 'winh-notes-error-handling' into 'master'Fatih Acet2019-05-086-7/+87
|\ \ \ \
| * | | | Make hasQuickActions statelesswinh-notes-error-handlingWinnie Hellmann2019-05-071-3/+4
| * | | | Add failing test for hasQuickActionsWinnie Hellmann2019-05-071-0/+17
| * | | | Handle errors in successful notes replyWinnie Hellmann2019-05-073-4/+21
| * | | | Add failing test for saveNote error handlingWinnie Hellmann2019-05-071-0/+45
* | | | | Merge branch 'docs-nneul/gitlab-ce-patch-1' into 'master'Achilleas Pipinellis2019-05-081-0/+16
|\ \ \ \ \
| * | | | | Docs nneul/gitlab ce patch 1Ian Baum2019-05-081-0/+16
|/ / / / /
* | | | | Merge branch 'revert-0658ebf7' into 'master'Achilleas Pipinellis2019-05-081-5/+2
|\ \ \ \ \
| * | | | | Revert "Merge branch 'fix-mermaid-chart-docs' into 'master'"revert-0658ebf7Stan Hu2019-05-071-5/+2
* | | | | | Merge branch 'emilie-master-patch-81125' into 'master'Evan Read2019-05-071-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add info to docs about mapping a ping to the category it belongs to.Emilie Schario2019-05-071-0/+2
|/ / / / /
* | | | | Merge branch '53973-fix-subpixel-border-issue' into 'master'Fatih Acet2019-05-072-0/+10
|\ \ \ \ \
| * | | | | Fix subpixel border issue53973-fix-subpixel-border-issuePaul Slaughter2019-05-072-0/+10
* | | | | | Merge branch '61494-set-status-modal-visual-bugs' into 'master'Fatih Acet2019-05-074-9/+13
|\ \ \ \ \ \
| * | | | | | Fix input group and action buttons in "set status" modalPaul Gascou-Vaillancourt2019-05-074-9/+13
|/ / / / / /
* | | | | | Merge branch '57654-add-time-preferences-for-user-fe' into 'master'Fatih Acet2019-05-0717-18/+300
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Added user time settings fields to profileEzekiel Kigbo2019-05-0717-18/+300
|/ / / / /
* | | | | Merge branch 'qa-quarantine-download-mr-patch-and-diff-test-suite' into 'master'Dan Davison2019-05-071-1/+2
|\ \ \ \ \
| * | | | | Quarantine download MR patch and diff test suiteqa-quarantine-download-mr-patch-and-diff-test-suiteWalmyr Lima2019-05-071-1/+2
* | | | | | Merge branch 'ce-jej/group-saml-sso-enforcement' into 'master'Robert Speicher2019-05-072-2/+11
|\ \ \ \ \ \
| * | | | | | CE changes for SSO web enforcementce-jej/group-saml-sso-enforcementJames Edwards-Jones2019-05-062-2/+11
* | | | | | | Merge branch 'fix-mermaid-chart-docs' into 'master'Sid Sijbrandij2019-05-071-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Load mermaid.min.js for now off-siteJoshua Lambert2019-05-071-2/+5
* | | | | | | | Merge branch 'ce-11099-removing-the-project-that-holds-the-insights-configura...Robert Speicher2019-05-071-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add remove_foreign_key_if_existsce-11099-removing-the-project-that-holds-the-insights-configuration-raises-an-errorLin Jen-Shin2019-05-071-0/+6
* | | | | | | | | Merge branch 'shell-9-1-0' into 'master'Douglas Barbosa Alexandre2019-05-072-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update gitlab-shell to v9.1.0Nick Thomas2019-05-072-1/+6
* | | | | | | | | | Merge branch '10808-allow-license-import-during-install' into 'master'Achilleas Pipinellis2019-05-074-3/+40
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Document EE License Auto Import During InstallRobert Marshall2019-05-074-3/+40
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ce-4452-in-line-chart-designer-mvc' into 'master'Clement Ho2019-05-075-60/+150
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add custom metrics form to dashboardAdriel Santiago2019-05-075-60/+150
|/ / / / / / / / /
* | | | | | | | | Merge branch 'js-i18n-protected-branches' into 'master'Clement Ho2019-05-074-3/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Internationalisation of protected_branches directoryBrandon Labuschagne2019-05-074-3/+13
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-24' into 'master'Drew Blessing2019-05-071-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | docs: clarify LDAP cache timeBen Bodenmiller2019-05-071-2/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'fix/js-error-ssh-key-view' into 'master'Clement Ho2019-05-072-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | fix(profile): disable SSH key validation in key details viewRoger Meier2019-05-072-0/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-10k-ref-wip' into 'master'Drew Blessing2019-05-071-1/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Apply suggestion to doc/administration/high_availability/README.mdDrew Blessing2019-05-071-1/+1
| * | | | | | | | Add the WIP 10k ref architecture specs to HA docsDrew Blessing2019-05-061-1/+25
* | | | | | | | | Merge branch '56850-add-new-unicorn-metrics' into 'master'Ash McKenzie2019-05-079-29/+153
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clarify wording in metrics documentation56850-add-new-unicorn-metricsRyan Cobb2019-05-011-2/+2