summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add profile mode to extend request profilingadd-profile-mode-to-extend-request-profilingQingyu Zhao2019-07-1810-69/+221
| | | | | | | Extend the support for "X-Profile-Token: <token>" to have an additional header that defines type of profile we are looking for, like: X-Profile-Mode: execution X-Profile-Mode: memory
* Merge branch 'ci_default_git_depth_only' into 'master'Douglas Barbosa Alexandre2019-07-182-0/+6
|\ | | | | | | | | API: Allow changing only ci_default_git_depth See merge request gitlab-org/gitlab-ce!30888
| * API: Allow changing only ci_default_git_depthMathieu Parent2019-07-182-0/+6
| |
* | Merge branch 'qa-selector-uniformization-common-1' into 'master'Sanad Liaquat2019-07-187-16/+16
|\ \ | | | | | | | | | | | | Refactor common Page Objects to use data tags (No. 1 Contd.) See merge request gitlab-org/gitlab-ce!30758
| * | Refactor common Page Objects to use data tagsDan Davison2019-07-187-16/+16
|/ / | | | | | | | | Common usages within GitLab QA include Login Page, navigation bars and layouts
* | Merge branch '10857-parse-multiple-reports-of-same-category-ce' into 'master'James Lopez2019-07-182-0/+40
|\ \ | | | | | | | | | | | | [CE backport] Parse and store multiple security reports of the same category See merge request gitlab-org/gitlab-ce!30658
| * | [CE backport] Parse and store multiple security reports of the same categoryVictor Zagorodny2019-07-182-0/+40
|/ /
* | Merge branch '58583-confidential-mr-docs' into 'master'Marcia Ramos2019-07-184-0/+51
|\ \ | | | | | | | | | | | | Doc: Merge Requests for Confidential Issues See merge request gitlab-org/gitlab-ce!30553
| * | Doc: resolving confidential issues in private forkPatrick Bajao2019-07-184-0/+51
|/ / | | | | | | | | | | Add a section in Confidential Issues documentation with information about the "Create confidential merge request" button/dropdown and how it can help in resolving confidential issues.
* | Merge branch 'webide-commit-use-correct-parent' into 'master'Nick Thomas2019-07-1817-99/+247
|\ \ | | | | | | | | | | | | Use correct parent when committing in WebIDE See merge request gitlab-org/gitlab-ce!29598
| * | FE remove create branch call in IDE commitwebide-commit-use-correct-parentPaul Slaughter2019-07-184-37/+7
| | | | | | | | | | | | | | | | | | | | | Previously `start_sha` was intercepted on the frontend to create the correct branch in a separate API call. Now that the commits API supports the `start_sha` parameter directly this workaround is not needed anymore.
| * | Add start_sha to commits APIMarkus Koller2019-07-1813-62/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing start_branch on committing from the WebIDE, it's possible that the branch has changed since editing started, which results in the change being applied on top of the latest commit in the branch and overwriting the new changes. By passing the start_sha instead we can make sure that the change is applied on top of the commit which the user started editing from.
* | | Merge branch 'feature/gb/serverless-app-deployment-template' into 'master'Thong Kuah2019-07-183-29/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Deploy serverless apps with `gitlabktl` Closes #64494 See merge request gitlab-org/gitlab-ce!30740
| * | | Add changelog entry for serverless apps deploymentfeature/gb/serverless-app-deployment-templateGrzegorz Bizon2019-07-151-0/+5
| | | |
| * | | Update docs on serverless apps deploymentsGrzegorz Bizon2019-07-151-21/+16
| | | |
| * | | Deploy serverless apps with `gitlabktl`Grzegorz Bizon2019-07-151-8/+5
| | | |
* | | | Merge branch 'sh-oracle-cloud-s3-docs' into 'master'Marcia Ramos2019-07-184-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Document how to make Oracle Cloud S3 work See merge request gitlab-org/gitlab-ce!30847
| * | | | Document how to make Oracle Cloud S3 worksh-oracle-cloud-s3-docsStan Hu2019-07-174-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related issues: * https://github.com/fog/fog-aws/issues/523 * https://gitlab.com/gitlab-org/gitlab-ce/issues/63041
* | | | | 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
View Lorry Controller Status