summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken handling for outdated test reposfix-fetch-test-reposMarkus Koller2019-07-181-12/+1
| | | | | The call to init had the side effect of starting another Gitaly process, and didn't actually correctly delete the test repositories.
* Merge branch 'adjust-cycle-analytics-to-group-level' into 'master'Sean McGivern2019-07-1849-127/+772
|\ | | | | | | | | Adjust cycle analytics to group level See merge request gitlab-org/gitlab-ce!30391
| * Remove changelog entryadjust-cycle-analytics-to-group-levelMałgorzata Ksionek2019-07-161-5/+0
| |
| * Add code review remarksMałgorzata Ksionek2019-07-165-33/+32
| | | | | | | | Change small things for better readability
| * Add timecop remarksMałgorzata Ksionek2019-07-161-30/+54
| |
| * Add code review remarksMałgorzata Ksionek2019-07-1611-65/+61
| | | | | | | | Make specs more readable
| * Fix test stage specsMałgorzata Ksionek2019-07-151-2/+2
| |
| * Add class for group level analyticsMałgorzata Ksionek2019-07-1549-113/+744
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for group level Update entities Update base classes Add groups-centric changes Update plan and review stage Add summary classes Add summary spec Update specs files Add to specs test cases for group Add changelog entry Add group serializer Fix typo Fix typo Add fetching namespace in sql query Update specs Add rubocop fix Add rubocop fix Modify method to be in sync with code review Add counting deploys from subgroup To group summary stage Add subgroups handling In group stage summary Add additional spec Add additional specs Add more precise inheritance Add attr reader to group level Fix rubocop offence Fix problems with specs Add cr remarks Renaming median method and a lot of calls in specs Move spec setup Rename method in specs Add code review remarks regarding module Add proper module name
* | Merge branch 'winh-autocomplete-images-docs' into 'master'Kushal Pandya2019-07-182-0/+0
|\ \ | | | | | | | | | | | | | | | | | | Set correct file mode for autocomplete images Closes #64733 See merge request gitlab-org/gitlab-ce!30889
| * | Set correct file mode for autocomplete imagesWinnie Hellmann2019-07-182-0/+0
|/ /
* | Merge branch '64700-fix-the-color-of-the-visibility-icon-on-project-lists' ↵Phil Hughes2019-07-184-6/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Fix the color of the visibility icon on project lists" Closes #64700 See merge request gitlab-org/gitlab-ce!30858
| * | Ensure visibility icons in group/project listings are greyDennis Tang2019-07-184-6/+7
|/ / | | | | | | | | | | - Project listing icons now use the `text-secondary` class - Group listing icons now use the `text-secondary` class - Unnecessary CSS was removed from groups.scss as a result
* | Merge branch 'localize-updated-text' into 'master'mr-origin-25578Kushal Pandya2019-07-181-1/+1
|\ \ | | | | | | | | | | | | Localize updated text on projects list page See merge request gitlab-org/gitlab-ce!30875
| * | Localize updated text on projects list pageClement Ho2019-07-181-1/+1
|/ /
* | Merge branch 'ds-charts-whitespace' into 'master'Kushal Pandya2019-07-185-21/+28
|\ \ | | | | | | | | | | | | | | | | | | Added whitespace for CI/CD Charts page sub-headers Closes #64309 See merge request gitlab-org/gitlab-ce!30531
| * | Perform more redactions in Redis performance bar tracesDietrich Stein2019-07-185-21/+28
|/ / | | | | | | | | | | | | HMSET and AUTH commands were not properly redacted. This commit does that and adds a test. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64309
* | Merge branch 'qa-replace-act-usages' into 'master'Mark Lapierre2019-07-1816-29/+29
|\ \ | | | | | | | | | | | | Quality: Refactor all existing usages of .act with .perform See merge request gitlab-org/gitlab-ce!30824
| * | Refactor all existing usages of .actDan Davison2019-07-1816-29/+29
|/ / | | | | | | | | Replace any occurance of .act with the preferred method .perform
* | Merge branch 'qa-unquarantine-attachment-test' into 'master'Stan Hu2019-07-181-2/+1
|\ \ | | | | | | | | | | | | | | | | | | Unquarantine object storage test Closes gitlab-org/quality/nightly#101 See merge request gitlab-org/gitlab-ce!30874
| * | Unquarantine object storage testMark Lapierre2019-07-181-2/+1
|/ / | | | | | | | | --compat mode in Minio is now enabled so this test should pass See https://gitlab.com/gitlab-org/gitlab-qa/merge_requests/260
* | Merge branch 'vzagorodny-go-guide-use-cmp-diff-in-tests' into 'master'Evan Read2019-07-181-2/+35
|\ \ | | | | | | | | | | | | Go guide: be more explicit on testing frameworks + diffing test results See merge request gitlab-org/gitlab-ce!29950
| * | Go guide: be more explicit on testing frameworks + diffing test resultsVictor Zagorodny2019-07-181-2/+35
|/ /
* | Merge branch ↵Evan Read2019-07-181-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 'if-12036-move_external_authorization_service_api_management_to_ee-doc' into 'master' Doc for "Move external authorization service API management to EE" See merge request gitlab-org/gitlab-ce!30579
| * | Doc for "Move external authorization service API management to EE"Imre Farkas2019-07-181-2/+2
|/ /
* | Merge branch 'docs-lists-cleanup-1' into 'master'Evan Read2019-07-1813-161/+161
|\ \ | | | | | | | | | | | | Fix unordered list spacing (part 1) See merge request gitlab-org/gitlab-ce!30794
| * | Fix unordered list spacingMarcel Amirault2019-07-1813-161/+161
|/ / | | | | | | | | Correct the spacing of unordered markdown lists in docs, to maintain standards of documentation.
* | Merge branch 'patch-72' into 'master'Ray Paik2019-07-181-1/+1
|\ \ | | | | | | | | | | | | typo See merge request gitlab-org/gitlab-ce!30860
| * | typomtmail2019-07-171-1/+1
| | |
* | | Merge branch 'fj-refactor-web-ide-counter' into 'master'Nick Thomas2019-07-178-76/+47
|\ \ \ | | | | | | | | | | | | | | | | Refactor WebIdeCommitsCounter and RedisCounter See merge request gitlab-org/gitlab-ce!30850
| * | | Refactor RedisCounter and WebIdeCommitsCounterFrancisco Javier López2019-07-178-76/+47
|/ / / | | | | | | | | | | | | This MR refactor RedisCounter and WebIdeCommitsCounter to be reused by other components.
* | | Merge branch 'qa-review-knapsack-reports' into 'master'Mark Lapierre2019-07-174-1/+120
|\ \ \ | | | | | | | | | | | | | | | | Generate single report file for review-qa-all parallel tests See merge request gitlab-org/gitlab-ce!28834
| * | | Generate parallel spec reportsqa-review-knapsack-reportsDesiree Chevalier2019-07-174-1/+120
| | | | | | | | | | | | | | | | | | | | Creates reports for parallel specs and collates them into a single HTML report and displays results on the merge request.
* | | | Merge branch 'jc-wrap-rugged-calls-with-disk-access' into 'master'Stan Hu2019-07-179-22/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Wrap rugged calls with access disk block See merge request gitlab-org/gitlab-ce!30592
| * | | | Wrap rugged calls with access disk blockjc-wrap-rugged-calls-with-disk-accessJohn Cai2019-07-169-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | Whenever we use the rugged implementation, we are going straight to disk so we want to bypass the disk access check.
* | | | | Merge branch 'winh-multiple-issueboards-core' into 'master'Mike Greiling2019-07-1710-4/+887
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move multiple issue boards frontend to core (CE-backport) See merge request gitlab-org/gitlab-ce!30503
| * | | | | Move boards switcher partialWinnie Hellmann2019-07-1710-4/+887
|/ / / / / | | | | | | | | | | | | | | | (cherry picked from commit a82e4d57a6fbba840a8a944e372b80866a1e48cc)
* | | | | Merge branch '50228-add-test-for-deploy-token-username' into 'master'Mayra Cabrera2019-07-171-0/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add tests for when deploy token usernames are not unique See merge request gitlab-org/gitlab-ce!30629
| * | | | | Add tests for when deploy token usernames are not uniqueKrasimir Angelov2019-07-171-0/+64
|/ / / / / | | | | | | | | | | | | | | | | | | | | Ensure correct behaviour when deploy tokens have the same username or deploy token and user have the same username.
* | | | | Merge branch 'fix-project-factory-pages-access-level-default' into 'master'Stan Hu2019-07-172-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix factory default for pages_access_level See merge request gitlab-org/gitlab-ce!30862
| * | | | | Fix factory default for pages_access_levelVladimir Shushlin2019-07-172-3/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | Pages access level currently depends on project visibilty which is ignored by factory, this commit fixes that
* | | | | Merge branch 'docs-quality-data-qa-selector' into 'master'Dan Davison2019-07-172-26/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add documentation surrounding [data-qa-selector] See merge request gitlab-org/gitlab-ce!30690
| * | | | | Add documentation surrounding [data-qa-selector]Dan Davison2019-07-172-26/+45
|/ / / / / | | | | | | | | | | | | | | | | | | | | Documentation was lacking for the [data-qa-selector] method of defining methods vs .qa-selector method.
* | | | | Merge branch 'rs-zz-metrics' into 'master'Lin Jen-Shin2019-07-171-0/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add EE-only class instrumentation See merge request gitlab-org/gitlab-ce!30802
| * | | | | Add EE-only class instrumentationrs-zz-metricsRobert Speicher2019-07-161-0/+31
| | | | | |
* | | | | | Merge branch 'mh/net-mocks-2' into 'master'Mike Greiling2019-07-179-14/+269
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mockify jquery and axios packages into `spec/frontend` Closes #60136 See merge request gitlab-org/gitlab-ce!29272
| * | | | | | Mockify jquery and axios packagesMartin Hanzel2019-07-179-14/+269
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the block that fails tests on unmocked axios requests from test_setup to its own mock, and added a jQuery mock that fails tests if they use unmocked $.ajax().
* | | | | | Merge branch 'mh/mocks-doc-2' into 'master'Mike Greiling2019-07-171-0/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs about auto-injected Jest mocks Closes #62899 See merge request gitlab-org/gitlab-ce!30791
| * | | | | | Add docs about auto-injected Jest mocksMartin Hanzel2019-07-171-0/+28
|/ / / / / /
* | | | | | Merge branch '9928ee-add-rule_type-to-approval-project-rules' into 'master'Mayra Cabrera2019-07-174-0/+41
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Add migration for adding rule_type to approval_project_rules See merge request gitlab-org/gitlab-ce!30575
| * | | | | Add rule_type to approval_project_rulesLucas Charles2019-07-174-0/+41
|/ / / / / | | | | | | | | | | | | | | | | | | | | Adds migration to introduce non-regular rule_types to approval_project_rules
View Lorry Controller Status