summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove Gitaly version in the docsdocs/pipelines-gitaly-version-removalZeger-Jan van de Weg2019-08-201-3/+2
| | | | | | | | It's very hard for end user to know what version of Gitaly is running, and they should not have to care about this detail either. Gitaly 1.21.0 was released before 11.9 was tagged, so it's an unsupported version too. This change removes the reference.
* Merge branch 'kp-add-vue-input-autofocus-directive' into 'master'Filipa Lacerda2019-08-202-0/+77
|\ | | | | | | | | Add `autofocusonshow` directive for input elements See merge request gitlab-org/gitlab-ce!31584
| * Add `autofocus` directive for input elementskp-add-vue-input-autofocus-directiveKushal Pandya2019-08-192-0/+77
| |
* | Merge branch 'fe-fix-merge-url-params-with-plus' into 'master'Kushal Pandya2019-08-204-6/+43
|\ \ | | | | | | | | | | | | | | | | | | Fix `mergeUrlParams` handling of '+' Closes #66152 See merge request gitlab-org/gitlab-ce!31973
| * | Add feature spec for search with spacefe-fix-merge-url-params-with-plusminghuan lei2019-08-191-5/+25
| | |
| * | Fix mergeUrlParams handling of `+`Paul Slaughter2019-08-193-1/+18
| | | | | | | | | | | | | | | | | | **What was the issue?** If a param value had `+`, it would be encoded as a literal `+` instead of a space.
* | | Merge branch 'update-sast-env-variables' into 'master'Jan Provaznik2019-08-201-0/+3
|\ \ \ | | | | | | | | | | | | | | | | Add missing SAST environment variables See merge request gitlab-org/gitlab-ce!31954
| * | | Add missing SAST environment variablesCameron Swords2019-08-201-0/+3
|/ / /
* | | Merge branch 'chore/fix-typo' into 'master'Marin Jankovski2019-08-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix minor typo: CE -> EE See merge request gitlab-org/gitlab-ce!31952
| * | | Fix minor typo: CE -> EEArun Kumar Mohan2019-08-191-1/+1
| | | |
* | | | Merge branch 'docs/add-docker-auth-config-notice' into 'master'Evan Read2019-08-201-8/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs DOCKER_AUTH_CONFIG not available for k8s See merge request gitlab-org/gitlab-ce!31961
| * | | | Docs DOCKER_AUTH_CONFIG not available for k8sSteve Azzopardi2019-08-201-8/+11
|/ / / /
* | | | Merge branch 'patch-74' into 'master'Ray Paik2019-08-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix typo in doc/ci/yaml/README.md See merge request gitlab-org/gitlab-ce!31923
| * | | | Update README.mdAlex Harford2019-08-161-1/+1
| | | | |
| * | | | Fix typo in doc/ci/yaml/README.mdAlex Harford2019-08-160-0/+0
| | | | |
* | | | | Merge branch 'winh-combine-frontend-testing-docs' into 'master'64171-remove-is_ee-flag-from-app-assets-javascripts-monitoring-components-dashboard-vueEvan Read2019-08-202-359/+363
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Combine old and new frontend testing guide (docs) See merge request gitlab-org/gitlab-ce!31852
| * | | | | Combine old and new frontend testing guide (docs)Winnie Hellmann2019-08-202-359/+363
|/ / / / /
* | | | | Merge branch 'username_suggests' into 'master'Ash McKenzie2019-08-201-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Back porting Username suggestion API changes See merge request gitlab-org/gitlab-ce!31986
| * | | | | Back porting Username suggestion API changesAishwarya Subramanian2019-08-201-0/+1
|/ / / / /
* | | | | Merge branch 'initial-docs-for-auto-devops-sidekiq' into 'master'Evan Read2019-08-201-0/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial docs for sidekiq worker with Auto DevOps Closes gitlab-org/charts/auto-deploy-app#1 See merge request gitlab-org/gitlab-ce!31949
| * | | | | Initial docs for sidekiq worker with Auto DevOpsinitial-docs-for-auto-devops-sidekiqDylan Griffith2019-08-201-0/+46
| | | | | |
* | | | | | Merge branch 'docs-66076-expansion-options' into 'master'Evan Read2019-08-202-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for incrementally expand mr diffs See merge request gitlab-org/gitlab-ce!31878
| * | | | | | Add documentation for incrementally expand mr diffsSamantha Ming2019-08-202-0/+9
|/ / / / / /
* | | | | | Merge branch '66161-replace-expand-icons' into 'master'Mike Greiling2019-08-192-4/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Use new "Expand up" and "Expand down" icons for diff expansion icons" Closes #66161 See merge request gitlab-org/gitlab-ce!31907
| * | | | | | Add expand up and expand down icons66161-replace-expand-iconsJarek Ostrowski2019-08-162-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog Add MR to changelog Remove stray file
* | | | | | | Merge branch 'docs-lists-cleanup-4' into 'master'Evan Read2019-08-1913-328/+331
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize markdown in /development and /workflow See merge request gitlab-org/gitlab-ce!31705
| * | | | | | | Standardize markdown in dev and workflowMarcel Amirault2019-08-1913-328/+331
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete trailing whitespace, fix blockquotes, fix note boxes, with indentation, clean up tables, etc.
* | | | | | | Merge branch 'sentry-extra-data' into 'master'Thong Kuah2019-08-192-3/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for sentry_extra_data in exceptions See merge request gitlab-org/gitlab-ce!31899
| * | | | | | | Add support for sentry_extra_data in exceptionsAlex Kalderimis2019-08-192-3/+43
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows exceptions to advertise their support for sentry and provide structured data.
* | | | | | | Merge branch 'fix-file-row-styling' into 'master'Paul Slaughter2019-08-192-6/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update file row styling See merge request gitlab-org/gitlab-ce!31884
| * | | | | | | Update file row stylingfix-file-row-stylingIllya Klymov2019-08-192-6/+7
| | | | | | | |
* | | | | | | | Merge branch 'mc/bug/nplusone-pipelines-show' into 'master'Stan Hu2019-08-191-7/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve nplusone spec for PipelinesController#show See merge request gitlab-org/gitlab-ce!31976
| * | | | | | | | Improve nplusone spec for PipelinesController#showMatija Čupić2019-08-191-7/+11
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'da-fix-n-plus-1-query-on-starrers-list' into 'master'Stan Hu2019-08-193-2/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix N+1s queries while loading users on the project starrers list See merge request gitlab-org/gitlab-ce!31984
| * | | | | | | | Fix N+1s queries while loading usersDouglas Barbosa Alexandre2019-08-193-2/+17
| | | | | | | | |
* | | | | | | | | Merge branch 'clean-obsolete-css' into 'master'Paul Slaughter2019-08-192-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove obsolete CSS and fix icon alignment See merge request gitlab-org/gitlab-ce!31897
| * | | | | | | | | Remove obsolete CSS and fix icon alignmentclean-obsolete-cssIllya Klymov2019-08-192-5/+5
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '64251-branch-name-set-cache' into 'master'Robert Speicher2019-08-197-17/+252
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache branch and tag names as Redis sets See merge request gitlab-org/gitlab-ce!30476
| * | | | | | | | | Cache branch and tag names as Redis setsNick Thomas2019-08-167-17/+252
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to check inclusion for the *_exists? methods without downloading the full list of branch names, which is over 100KiB in size for gitlab-ce at the moment.
* | | | | | | | | Merge branch '66061-update-tooltip-of-detached-label-state' into 'master'Clement Ho2019-08-194-5/+10
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update tooltip of "detached" label/state" Closes #66061 See merge request gitlab-org/gitlab-ce!31917
| * | | | | | | | Mark detached tooltip for translationjakeburden2019-08-191-1/+1
| | | | | | | | |
| * | | | | | | | Update tooltip of "detached" label/state66061-update-tooltip-of-detached-label-statejakeburden2019-08-194-5/+10
| | | | | | | | |
* | | | | | | | | Merge branch '9643-hooks-to-sync-to-jira-connect-ce' into 'master'Mayra Cabrera2019-08-191-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Add hooks to sync dev info to Jira using Connect App See merge request gitlab-org/gitlab-ce!31398
| * | | | | | | | | [CE] Add hooks to sync dev info to Jira using Connect AppHeinrich Lee Yu2019-08-191-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch '11877-public-approval-api-ee-docs' into 'master'Douwe Maan2019-08-191-56/+238
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: add project approval rule endpoints See merge request gitlab-org/gitlab-ce!31455
| * | | | | | | | | Doc: add project approval rule endpointsMark Chao2019-08-191-56/+238
|/ / / / / / / / /
* | | | | | | | | Merge branch '10197-multiple-assignees-avatars-scrolling-bug' into 'master'Paul Slaughter2019-08-191-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport: Fixed sidebar assignees scrolling bug See merge request gitlab-org/gitlab-ce!31932
| * | | | | | | | | Backport: Fixed sidebar assignees scrolling bug10197-multiple-assignees-avatars-scrolling-bugDonald Cook2019-08-171-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'add-js-prevent-default-on-click' into 'master'Clement Ho2019-08-196-13/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace inline scripts in links to prevent default See merge request gitlab-org/gitlab-ce!31838
| * | | | | | | | | | Replace inline scripts in links to prevent defaultadd-js-prevent-default-on-clickHeinrich Lee Yu2019-08-196-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use buttons instead of links with javascript:void(0)