summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve diff navigation header57364-improve-diff-nav-headerSam Bigelow2019-04-0514-87/+179
| | | | | | | | | | | | | | - Compare versions header is full width except in the unified diff mode with no tree sidebar - Bar is always full width, but the content within stays centered when unified and no tree sidebar - File header is the same height as the "Compare versions header" - aligns with the design system grid guidelines => 56px - Diff file headers use a button group, switch icon order to open file externally being the last option, all buttons will become icon buttons (icon delivery by @dimitrieh) - If a file header becomes sticky no rounded corner/double border problem is visible anymore
* Merge branch 'docs-anchors-17' into 'master'Evan Read2019-04-021-1/+1
|\ | | | | | | | | Docs: Fix anchor to deprecated variables doc See merge request gitlab-org/gitlab-ce!26788
| * Docs: Fix anchor to deprecated variables docMarcel Amirault2019-04-021-1/+1
|/
* Merge branch 'docs/restructure-ci-envs-and-deployment' into 'master'Mike Lewis2019-04-013-322/+450
|\ | | | | | | | | Refactor and restructure environments page See merge request gitlab-org/gitlab-ce!26400
| * Fixes from reviewdocs/restructure-ci-envs-and-deploymentEvan Read2019-03-271-3/+1
| |
| * Refactor and restructure environments pageEvan Read2019-03-263-322/+452
| | | | | | | | | | - Groups content into relevant sections. - Content edited.
* | Merge branch 'docs/refactor-pipeline-schedules' into 'master'Mike Lewis2019-04-011-55/+66
|\ \ | | | | | | | | | | | | Refactor and fix pipeline schedules See merge request gitlab-org/gitlab-ce!26756
| * | Refactor and fix pipeline schedulesEvan Read2019-04-011-55/+66
|/ /
* | Merge branch 'bvl-stream-io-into-gitaly' into 'master'Nick Thomas2019-04-016-11/+22
|\ \ | | | | | | | | | | | | Allow streaming io objects into Gitaly See merge request gitlab-org/gitlab-ce!26738
| * | Allow streaming io objects into GitalyBob Van Landuyt2019-04-016-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | This allows us to set the encoding of an IO passed without reading it into memory. This is useful if we want to stream files into Gitaly. Like we do when uploading a new file to the repository.
* | | Merge branch 'winh-rejected-jest-promises' into 'master'Fatih Acet2019-04-012-4/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fail Jest tests for unhandled Promise rejections Closes #56053 See merge request gitlab-org/gitlab-ce!26424
| * | | Fail correct test for Promisewinh-rejected-jest-promisesWinnie Hellmann2019-03-291-4/+7
| | | |
| * | | Fail for unhandled Promise rejections in JestWinnie Hellmann2019-03-292-0/+21
| | | |
* | | | Merge branch 'nfriend-css-updates-for-gitlab-design-system-compliance' into ↵Fatih Acet2019-04-013-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update border radius of form controls and remove space above page titles See merge request gitlab-org/gitlab-ce!24497
| * | | | Update border radius of form controls and remove space above page titlesnfriend-css-updates-for-gitlab-design-system-complianceNathan Friend2019-02-143-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | This commit makes changes to global CSS styles to bring the product closer to compliance with Pajamas (the GitLab design system).
* | | | | Merge branch 'winh-jest-jquery-matchers' into 'master'Clement Ho2019-04-014-1/+15
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Add jQuery matchers to Jest Closes #59637 See merge request gitlab-org/gitlab-ce!26722
| * | | | Add jQuery matchers to JestWinnie Hellmann2019-04-014-1/+15
|/ / / /
* | | | Merge branch 'sh-force-gc-after-import' into 'master'Douglas Barbosa Alexandre2019-04-015-3/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force a full GC after importing a project Closes #59477 See merge request gitlab-org/gitlab-ce!26803
| * | | | Force a full GC after importing a projectsh-force-gc-after-importStan Hu2019-04-015-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During a project import, it's possible that new branches are created by the importer to handle pull requests that have been created from forked projects, which would increment the `pushes_since_gc` value via `HousekeepingService.increment!` before a full garbage collection gets to run. This causes HousekeepingService to skip the full `git gc` and move to the incremental repack mode. To ensure that a garbage collection is run to pack refs and objects, explicitly execute the task. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59477
* | | | | Merge branch 'frozen_string_spec_workers' into 'master'Douglas Barbosa Alexandre2019-04-01118-0/+236
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add # frozen_string_literal to spec/workers See merge request gitlab-org/gitlab-ce!26790
| * | | | | Add frozen_string_literal to spec/workersfrozen_string_spec_workersThong Kuah2019-04-01118-0/+236
| |/ / / / | | | | | | | | | | | | | | | Adds `# frozen_string_literal: true` to spec/workers ruby files
* | | | | Merge branch 'jc-remove-find-all-tags-ff' into 'master'Douglas Barbosa Alexandre2019-04-012-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove find all tags feature flag See merge request gitlab-org/gitlab-ce!26746
| * | | | | Remove find all tags feature flagjc-remove-find-all-tags-ffJohn Cai2019-03-282-2/+2
| | | | | |
* | | | | | Merge branch 'bvl-pipeline-spec-broken-master' into 'master'Robert Speicher2019-04-011-3/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the pipeline feature spec Closes #59747 See merge request gitlab-org/gitlab-ce!26822
| * | | | | | Refactor pipeline_specBob Van Landuyt2019-04-011-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure we load the page as part of the spec, instead of a before block. So we could still perform setup inside shared examples, avoiding failures caught by data being wrongly cached when loading the page multiple times during a single spec
* | | | | | | Merge branch 'fix-container-scanning-on-k8s' into 'master'Douglas Barbosa Alexandre2019-04-013-6/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Container Scanning for Kubernetes Runners Closes gitlab-ee#5763 and gitlab-ee#6636 See merge request gitlab-org/gitlab-ce!26793
| * | | | | | | Fix Container Scanning for Kubernetes Runnersfix-container-scanning-on-k8sPhilippe Lafoucrière2019-03-313-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6636 closes https://gitlab.com/gitlab-org/gitlab-ee/issues/5763
* | | | | | | | Merge branch 'first-proof-reader' into 'master'Marcia Ramos2019-04-011-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add details for the first proof reader request See merge request gitlab-org/gitlab-ce!26812
| * | | | | | | | Add details for the first proof reader requestfirst-proof-readerRay Paik2019-04-011-0/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'design-management-permissions-ce' into 'master'Douwe Maan2019-04-012-2/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Allow extra permissions in Project & Issue GraphQL types See merge request gitlab-org/gitlab-ce!26818
| * | | | | | | | Extra permissions in Project & Issue GraphQLBob Van Landuyt2019-04-012-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow extra permissions for the `Types::ProjectType` and `Types:IssueType` GraphQL types. As we'll be adding more permissions in CE. Now this spec only validates if all the expected permissions are present, but it will not fail if there are more.
* | | | | | | | | Merge branch '59441-add-base-domain-to-cluster-api' into 'master'Nick Thomas2019-04-015-3/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include cluster domain in Project Clusters API Closes #59441 See merge request gitlab-org/gitlab-ce!26735
| * | | | | | | | | Include cluster domain into Project Cluster APIMayra Cabrera2019-04-015-3/+21
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Domain was introduced on 11.8 and was not included on the Project Cluster API. With this change user will be able to include domain when adding and updating a cluster. Domain will also be included on the GET calls. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59441
* | | | | | | | | Merge branch 'check-mergeability-in-merge-to-ref-service' into 'master'Douglas Barbosa Alexandre2019-04-015-14/+50
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check mergeability in merge to ref service See merge request gitlab-org/gitlab-ce!26757
| * | | | | | | | | Check mergeability in merge to ref servicecheck-mergeability-in-merge-to-ref-serviceShinya Maeda2019-04-015-14/+50
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and add spec Add changelog ok ok
* | | | | | | | | Merge branch 'contribute/fix-nav-links-archived-project' into 'master'Douglas Barbosa Alexandre2019-04-013-2/+59
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable inaccessible navigation links upon archiving a project Closes #58793 See merge request gitlab-org/gitlab-ce!26020
| * | | | | | | | | Disable inaccessible navigation links upon archiving a projectElias Werberich2019-03-313-2/+59
| | | | | | | | | |
* | | | | | | | | | Merge branch 'enable-rubocop-application-record' into 'master'Lin Jen-Shin2019-04-014-2/+31
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document ApplicationRecord / pluck_primary_key Closes #59690 See merge request gitlab-org/gitlab-ce!26764
| * | | | | | | | | | Document ApplicationRecord / pluck_primary_keyNick Thomas2019-03-294-2/+31
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | We also enable the rubocop that makes it mandatory
* | | | | | | | | | Merge branch '57669-fix-bug-clicking-file-header-refreshes-page' into 'master'Clement Ho2019-04-016-24/+171
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where clicking file header in diff refreshes page Closes #57669 See merge request gitlab-org/gitlab-ce!26422
| * | | | | | | | | | Scroll to diff file when clicking on file name57669-fix-bug-clicking-file-header-refreshes-pageSam Bigelow2019-03-296-24/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add an ID to the diff content - handle clicking on file name in diffFileHeader when it is not a link to another page but rather a link to an element on the page
* | | | | | | | | | | Merge branch 'fj-59547-fix-has-commits' into 'master'Nick Thomas2019-04-012-4/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MergeRequest#has_commits? nil comparison Closes #59547 See merge request gitlab-org/gitlab-ce!26828
| * | | | | | | | | | | Fix MergeRequest#has_commits? nil comparisonFrancisco Javier López2019-04-012-4/+11
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'frozen_string_spec_models' into 'master'Grzegorz Bizon2019-04-01275-11/+583
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add # frozen_string_literal to spec/models See merge request gitlab-org/gitlab-ce!26791
| * | | | | | | | | | | Don't use frozen_string_literal for nowfrozen_string_spec_modelsThong Kuah2019-04-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we debug why this is failing
| * | | | | | | | | | | Fix license_template_spec to not modify StringThong Kuah2019-04-011-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revamp how spec verifies proc#call called only once
| * | | | | | | | | | | Don't modify String in instance_configuration_specThong Kuah2019-04-011-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Fix cert_manager_spec to not modify StringThong Kuah2019-04-011-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also break up long string to be readable
| * | | | | | | | | | | Add # frozen_string_literal to spec/modelsThong Kuah2019-04-01276-0/+552
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `# frozen_string_literal: true` to spec/models ruby files
* | | | | | | | | | | Merge branch 'refactor/services_list_of_apps_responsibility' into 'master'Grzegorz Bizon2019-04-014-47/+32
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dry up and remove responsibilities from services Closes #58646 See merge request gitlab-org/gitlab-ce!26731