summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove slugify text utilityfe-remove-slugifyPaul Slaughter2019-04-122-13/+0
| | | | | | **Why?** This function was not being used and it's documentation was out of date.
* Merge branch 'id-undefined-pages-for-wiki-page' into 'master'Douwe Maan2019-04-122-4/+8
|\ | | | | | | | | Fix grouping wiki pages by directory See merge request gitlab-org/gitlab-ce!27294
| * Fix grouping wiki pages by directoryIgor2019-04-122-4/+8
|/ | | | | | | | If a page has the same name as a directory the WikiPage#group_by_directory method can have a wrong behaviour This commit fixes it
* Merge branch 'refactor_cluster_application_services' into 'master'Kamil Trzciński2019-04-126-31/+42
|\ | | | | | | | | Refactor cluster application services See merge request gitlab-org/gitlab-ce!27191
| * Do not rescue errors from state transitionsThong Kuah2019-04-126-31/+42
|/ | | | | | | As this are un-expected errors which we should hear about from Sentry. Still rescue StandardError when operating a Helm action as we can get non Kubeclient errors such as SSL certificate or network errors
* Merge branch '59925-reports' into 'master'Phil Hughes2019-04-121-5/+0
|\ | | | | | | | | | | | | Removes unused CSS in reports Closes #59925 See merge request gitlab-org/gitlab-ce!27310
| * Removes unused CSSFilipa Lacerda2019-04-121-5/+0
| |
* | Merge branch '59921-pipeline-schedule' into 'master'Phil Hughes2019-04-123-9/+9
|\ \ | | | | | | | | | | | | | | | | | | Replaces CSS with BS4 utility class Closes #59921 See merge request gitlab-org/gitlab-ce!27309
| * | Replaces CSS with BS4 utility classFilipa Lacerda2019-04-123-9/+9
| |/
* | Merge branch 'mw-i18n-app-models' into 'master'Nick Thomas2019-04-1221-95/+377
|\ \ | | | | | | | | | | | | Externalize strings in app/models See merge request gitlab-org/gitlab-ce!27207
| * | Externalize strings in app/modelsMartin Wortschack2019-04-1221-95/+377
|/ / | | | | | | - Update PO file
* | Merge branch 'pl-user-bot_type-ce' into 'master'Sean McGivern2019-04-121-7/+3
|\ \ | |/ |/| | | | | CE Backport: Refactor Service Desk's bot user See merge request gitlab-org/gitlab-ce!26671
| * Remove User#internal_attributes methodPeter Leitzen2019-04-121-7/+3
|/ | | | | It's not needed anymore as we've replaced boolean `support_bot` with enum `bot_type`.
* Merge branch 'enable_example_wording_cop' into 'master'James Lopez2019-04-124-7/+9
|\ | | | | | | | | Enable RSpec/ExampleWording cop See merge request gitlab-org/gitlab-ce!27187
| * Enable RSpec/ExampleWording copThong Kuah2019-04-124-7/+9
|/
* Merge branch 'diff-fluid-layout-fix' into 'master'Kushal Pandya2019-04-124-2/+18
|\ | | | | | | | | | | | | Fixed fluid layout preference not being respected in diffs Closes #52916 See merge request gitlab-org/gitlab-ce!27302
| * Fixed fluid layout preference not being respected in diffsPhil Hughes2019-04-124-2/+18
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
* | Merge branch '60261-save-btn-env' into 'master'Kushal Pandya2019-04-122-1/+6
|\ \ | | | | | | | | | | | | | | | | | | Fixes white background in the save button for environments Closes #60261 See merge request gitlab-org/gitlab-ce!27161
| * | Updates Save button to have a green bg60261-save-btn-envFilipa Lacerda2019-04-092-1/+6
| | | | | | | | | | | | | | | The Save button in the environments create/edit form was white, it should be green.
* | | Merge branch '60224-btn-env' into 'master'Kushal Pandya2019-04-122-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removes extra btn class from dropdown Closes #60224 See merge request gitlab-org/gitlab-ce!27160
| * | | Removes extra btn class from dropdown60224-btn-envFilipa Lacerda2019-04-092-1/+6
| |/ / | | | | | | | | | | | | In the deployments page, the links inside a dropdown had an extra btn class
* | | Merge branch 'sh-allow-unauth-chrome' into 'master'Grzegorz Bizon2019-04-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow unauthenticated downloads of Chrome Closes #60441 See merge request gitlab-org/gitlab-ce!27297
| * | | Allow unauthenticated downloads of ChromeStan Hu2019-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Google GPG key used to sign the apt repository expired today, so all installs will fail unless `--allow-unauthenticated` is used. We should revert this once the repository has been updated with the more recent key. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60441
* | | | Merge branch 'docs/remove-home-nfs' into 'master'Achilleas Pipinellis2019-04-121-9/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Remove recommending moving the home dir to NFS See merge request gitlab-org/gitlab-ce!27286
| * | | Remove recommending moving the home dir to NFSdocs/remove-home-nfsCindy Pallares2019-04-111-9/+2
| | | |
* | | | Merge branch 'fe-fix-ee-diff-in-text-utility-spec' into 'master'Filipa Lacerda2019-04-121-8/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diff in text_utility_spec See merge request gitlab-org/gitlab-ce!27291
| * | | | Resolve CE/EE diff in text_utility_specfe-fix-ee-diff-in-text-utility-specPaul Slaughter2019-04-111-8/+6
| | | | |
* | | | | Merge branch '59896-builds-css' into 'master'Phil Hughes2019-04-125-47/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes stylelint issues for builds.scss Closes #59896 See merge request gitlab-org/gitlab-ce!27279
| * | | | | Fixes stylelint issues for builds.scss59896-builds-cssFilipa Lacerda2019-04-115-47/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces CSS with utility classes Removes unused CSS
* | | | | | Merge branch 'remove-extend-fixed-width' into 'master'Phil Hughes2019-04-121-8/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include fixed-width mixin instead of extending the class See merge request gitlab-org/gitlab-ce!27277
| * | | | | | Include fixed-width mixin instead of extending the classremove-extend-fixed-widthAnnabel Dunstone Gray2019-04-111-8/+3
| | | | | | |
* | | | | | | Merge branch 'fix-api-group-visibility' into 'master'Michael Kozono2019-04-125-2/+30
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Fix api group visibility See merge request gitlab-org/gitlab-ce!26896
| * | | | | | Squashed commits and modified visibility level outputSara Ahbabou2019-04-125-2/+30
|/ / / / / / | | | | | | | | | | | | | | | | | | Added changelog and rebased
* | | | | | Merge branch ↵Fatih Acet2019-04-111-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '10015-move-ee-differences-for-app-assets-javascripts-boards-models-milestone-js' into 'master' Backport of "Move EE differences for `app/assets/javascripts/boards/models/milestone.js`" See merge request gitlab-org/gitlab-ce!27272
| * | | | | | Backport of EE changes to board milestone model10015-move-ee-differences-for-app-assets-javascripts-boards-models-milestone-jsConstance Okoghenun2019-04-111-1/+10
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'winh-notes_spec-timeout' into 'master'Fatih Acet2019-04-111-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Increase timeout for notes_spec.js See merge request gitlab-org/gitlab-ce!27270
| * | | | | Increase timeout for notes_spec.jswinh-notes_spec-timeoutWinnie Hellmann2019-04-111-1/+1
| | | | | |
* | | | | | Merge branch 'proj-settings-ok-leftovers' into 'master'Clement Ho2019-04-1116-293/+456
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Improve project settings page (leftovers) See merge request gitlab-org/gitlab-ce!27078
| * | | | | | Update project settings qa selectorsSanad Liaquat2019-04-118-2276/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally fixes geo rename test.
| * | | | | | Improve project settings pageLuke Bennett2019-04-1114-272/+2572
|/ / / / / / | | | | | | | | | | | | | | | | | | Prioritize and simplify project settings content.
* | | | | | Update CHANGELOG.md for 11.9.8GitLab Release Tools Bot2019-04-115-20/+16
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'patch-31' into 'master'Stan Hu2019-04-111-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing provider_unauthorized method to import_github.rb Closes #60347 See merge request gitlab-org/gitlab-ce!27218
| * | | | | | Return a `401` error codeBen2019-04-111-1/+1
| | | | | | |
| * | | | | | Fix trailing white spaceBen2019-04-101-1/+1
| | | | | | |
| * | | | | | Add missing provider_unauthroized method to import_github.rb Ben2019-04-101-0/+4
| | | | | | |
* | | | | | | Merge branch 'fj-bump-workhorse-version-8-6-0' into 'master'Nick Thomas2019-04-112-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Workhorse to v8.6.0 See merge request gitlab-org/gitlab-ce!27260
| * | | | | | | Update GitLab Workhorse to v8.6.0Francisco Javier López2019-04-112-1/+6
|/ / / / / / /
* | | | | | | Merge branch '60398-increase-timeouts-clusters-bundle' into 'master'Phil Hughes2019-04-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase clusters bundle specs timeout Closes #60398 See merge request gitlab-org/gitlab-ce!27269
| * | | | | | | Increase clusters bundle specs timeout60398-increase-timeouts-clusters-bundleEnrique Alcantara2019-04-111-1/+1
| | | | | | | |
* | | | | | | | Merge branch '60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling' ↵Annabel Dunstone Gray2019-04-112-1/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Long file names in MR diffs cause horizontal scrolling" Closes #60304 See merge request gitlab-org/gitlab-ce!27233
View Lorry Controller Status