summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add frozen_string_literal to qa/frozen_string_literal_qaThong Kuah2019-04-1398-1/+198
| | | | | This will be default in Ruby 3, so will be good to apply in QA ahead of time to be consistent.
* 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
| * | | | | | Only make margin-auto on large screens for diff file header60304-long-file-names-in-mr-diffs-cause-horizontal-scrollingSam Bigelow2019-04-102-1/+6
| |/ / / / /
* | | | | | Merge branch 'restore-hipchat' into 'master'Nick Thomas2019-04-1126-27/+963
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Remove HipChat integration from GitLab" Closes #60042 See merge request gitlab-org/gitlab-ce!27172
| * | | | | Restore index on services.typeSean McGivern2019-04-112-0/+21
| | | | | |
| * | | | | Add frozen_string_literal to HipChat filesrestore-hipchatSean McGivern2019-04-103-0/+5
| | | | | |
| * | | | | Fix UrlBlocker specSean McGivern2019-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newer version of HTTParty we now use will try harder to get a valid URL out of a relative one. Unfortunately, when there's no room (as was the case in this spec), the relative URL begins with `//`, which is actually a protocol-relative URL, not a simple path. Adding a room - which will always be the case in 'real life' - fixes this.
| * | | | | Add changelog entrySean McGivern2019-04-101-0/+5
| | | | | |
| * | | | | Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-1027-48/+953
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* | | | | | Merge branch 'qa-staging-53-quarantine-issue-suggesstions-spec' into 'master'Rémy Coutable2019-04-111-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine Issue suggestions spec See merge request gitlab-org/gitlab-ce!27259
| * | | | | | Qurantine Issue suggestions specSanad Liaquat2019-04-111-1/+2
| | | | | | |
* | | | | | | Merge branch 'docs/repo-mirrors-and-sidekiq' into 'master'Achilleas Pipinellis2019-04-111-6/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better documentation on repo mirroring enqueuing Closes gitlab-ee#10345 See merge request gitlab-org/gitlab-ce!27093
| * | | | | | | Better documentation on repo mirroring enqueuingEvan Read2019-04-111-6/+11
|/ / / / / / /
* | | | | | | Merge branch 'docs-pages-intro' into 'master'Achilleas Pipinellis2019-04-118-367/+92
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Refactor Pages' intro guide See merge request gitlab-org/gitlab-ce!27136
| * | | | | | | Refactor intro guideMarcia Ramos2019-04-118-367/+92
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundancies: - Domains - User/group/project sites
* | | | | | | Merge branch 'docs/add-whitepaper-note' into 'master'Achilleas Pipinellis2019-04-111-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edits for GKE whitepaper note Closes gitlab-ee#11103 See merge request gitlab-org/gitlab-ce!27243
| * | | | | | | Edits for GKE whitepaper noteEvan Read2019-04-111-0/+6
|/ / / / / / /
* | | | | | | Merge branch 'fixed-web-ide-merge-request-review' into 'master'Kushal Pandya2019-04-114-0/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Web IDE not loading merge request files Closes #60243 See merge request gitlab-org/gitlab-ce!27225
| * | | | | | | Fixes Web IDE not loading merge request filesPhil Hughes2019-04-114-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60243
* | | | | | | | Merge branch 'revert-24704-download-repository-path' into 'master'Rémy Coutable2019-04-1118-136/+63
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '24704-download-repository-path' into 'master'" See merge request gitlab-org/gitlab-ce!27249
| * | | | | | | | Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-pathPatrick Bajao2019-04-1118-136/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6c75bd015cba181f028bc87c396c3d8e43b5dc3e, reversing changes made to 1be7f5aaa38aba79843eae8835be6c99c025e982.
* | | | | | | | | Merge branch '60278-fix-development-seed' into 'master'Douwe Maan2019-04-113-4/+6
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ApplicationSetting development seed Closes #60278 See merge request gitlab-org/gitlab-ce!27213