summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* only include _html fields when asked forPhil Hughes2018-07-055-12/+13
|
* added html to responsePhil Hughes2018-07-052-2/+8
|
* update designPhil Hughes2018-07-051-33/+12
|
* :sparkles: use pre-existing components for title and descriptionPhil Hughes2018-07-052-70/+70
|
* Added merge request info to Web IDE sidebarPhil Hughes2018-07-053-1/+122
| | | | Closes #45187
* Merge branch 'fj-web-terminal-ci-build' into 'master'Douwe Maan2018-07-0520-9/+344
|\ | | | | | | | | | | | | Web Terminal Ci Build Closes #47116 See merge request gitlab-org/gitlab-ce!19773
| * Web Terminal Ci BuildFrancisco Javier López2018-07-0520-9/+344
|/
* Merge branch 'patch-19' into 'master'Filipa Lacerda2018-07-052-2/+7
|\ | | | | | | | | fix double "in" in time to artifact deletion See merge request gitlab-org/gitlab-ce!20357
| * fix double "in" in time to artifact deletionBen Bodenmiller2018-07-052-2/+7
|/
* Merge branch '48825-performance' into 'master'Phil Hughes2018-07-055-94/+143
|\ | | | | | | | | | | | | Improves performance on MR refactor and adds specs Closes #48825 See merge request gitlab-org/gitlab-ce!20380
| * Improves performance on MR refactor and adds specsFilipa Lacerda2018-07-055-94/+143
|/
* Merge branch 'tz-file-icons-in-mrs' into 'master'Filipa Lacerda2018-07-053-10/+14
|\ | | | | | | | | | | | | File Icons in Merge Requests Closes #48651 See merge request gitlab-org/gitlab-ce!20268
| * File Icons in Merge RequestsTim Zallmann2018-07-053-10/+14
|/
* Merge branch ↵Phil Hughes2018-07-054-3/+17
|\ | | | | | | | | | | | | | | | | '44697-when-editing-a-comment-in-an-issue-the-preview-mode-is-toggled-in-the-main-textarea' into 'master' Resolve "When editing a comment in an issue, the preview mode is toggled in the main textarea" Closes #44697 See merge request gitlab-org/gitlab-ce!20112
| * Resolve "When editing a comment in an issue, the preview mode is toggled in ↵Constance Okoghenun2018-07-054-3/+17
|/ | | | the main textarea"
* Merge branch 'issue_48474' into 'master'Sean McGivern2018-07-055-1/+40
|\ | | | | | | | | | | | | Fix discussion entity for legacy diff notes Closes #48474 See merge request gitlab-org/gitlab-ce!20214
| * Merge branch 'issue_48474' of gitlab.com:gitlab-org/gitlab-ce into issue_48474Felipe Artur2018-07-041-1/+1
| |\
| | * Remove space between curly braceFelipe Artur2018-06-281-1/+1
| | |
| * | Render LegacyDiffNote when diff_file blob is nilFelipe Artur2018-07-043-0/+20
| |/
| * Fix discussion entity for legacy diff notesFelipe Artur2018-06-272-1/+20
| |
* | Merge branch 'i18n-extract-app/views/projects-snippets' into 'master'Rémy Coutable2018-07-056-26/+44
|\ \ | | | | | | | | | | | | i18n: externalize strings from 'app/views/projects/snippets' See merge request gitlab-org/gitlab-ce!19828
| * | i18n: externalize strings from 'app/views/projects/snippets'Tao Wang2018-07-016-26/+44
| | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | Merge branch 'frozen-string-enable-app-uploaders' into 'master'Rémy Coutable2018-07-0516-1/+36
|\ \ \ | | | | | | | | | | | | | | | | Enable frozen string in apps/uploaders/*.rb See merge request gitlab-org/gitlab-ce!20382
| * | | Enable frozen string in apps/validators/*.rbgfyoung2018-07-0516-1/+36
| | | | | | | | | | | | | | | | Partially addresses #47424.
* | | | Merge branch 'docs/use-ref-slug-for-docs-review' into 'master'Rémy Coutable2018-07-052-12/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor the review-docs workflow See merge request gitlab-org/gitlab-ce!20365
| * | | | Simplify downstream branch nameAchilleas Pipinellis2018-07-052-10/+6
| | | | |
| * | | | Use CI_COMMIT_REF_SLUG for the env URL in review-docs jobsAchilleas Pipinellis2018-07-041-2/+2
| | | | |
* | | | | Merge branch 'rm-wrong-changelog' into 'master'Rémy Coutable2018-07-051-5/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unneeded changelog See merge request gitlab-org/gitlab-ce!20396
| * | | | | Remove unneeded changelogAchilleas Pipinellis2018-07-051-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changelog of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18027 was in the wrong location. [ci skip]
* | | | | | Merge branch 'remove-unnecessary-ignore-for-gitaly-n-plus-one' into 'master'Douwe Maan2018-07-052-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary ignore for Gitaly N+1 Closes #47594 See merge request gitlab-org/gitlab-ce!20393
| * | | | | Remove Gitaly N+1 ignore from NotificationRecipientService specSean McGivern2018-07-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was because we were creating projects unnecessarily. These should be set as the `source` for the notification setting, not the `project`!
| * | | | | Clean up Gitaly N+1 stack tracesSean McGivern2018-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to know the details of every library involved in these calls; they will always originate in the GitLab app itself.
* | | | | | Merge branch '48779-qa-merge-request-squash-sometimes-fail' into 'master'Sean McGivern2018-07-052-9/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "QA: Merge request squash sometimes fail" Closes #48779 See merge request gitlab-org/gitlab-ce!20375
| * | | | | | [QA] Ensure we wait for the squash checbox to be clickable before clicking ↵Rémy Coutable2018-07-052-9/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it in the squash scenario Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Update CHANGELOG.md for 11.0.3GitLab Release Tools Bot2018-07-0515-71/+20
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'close-revoke-deploy-token-modal-on-escape-keypress' into 'master'Phil Hughes2018-07-053-1/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close revoke deploy token modal on escape keypress See merge request gitlab-org/gitlab-ce!20347
| * | | | | | | Close revoke deploy token modal on escape keypressGeorge Tsiolis2018-07-053-1/+31
|/ / / / / / /
* | | | | | | Merge branch '45738-add-environment-drop-down-to-metrics-dashboard' into ↵Phil Hughes2018-07-058-16/+178
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add `environment` drop down to Metrics dashboard Closes #45738 See merge request gitlab-org/gitlab-ce!19833
| * | | | | | | populate environments dropdown, add testsJose2018-07-048-20/+136
| | | | | | | |
| * | | | | | | Add environments endpoint, also added store and service capabilities for ↵Jose2018-07-034-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | said endpoint
| * | | | | | | Moves the request of the environments list to the index actionTiago Botelho2018-07-032-17/+6
| | | | | | | |
| * | | | | | | Adds environments list to additional_metrics JSON payloadTiago Botelho2018-07-031-1/+6
| | | | | | | |
| * | | | | | | Serializes environments list in metrics JSON endpointTiago Botelho2018-07-031-2/+7
| | | | | | | |
| * | | | | | | Add dropdown, without dataJose2018-07-033-9/+30
| | | | | | | |
| * | | | | | | Add environments list instance variable to environment metrics viewTiago Botelho2018-07-032-3/+6
| | | | | | | |
* | | | | | | | Merge branch 'ce-5787-extract-ee-boards' into 'master'Phil Hughes2018-07-056-37/+93
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Port of EE refactoring to extract EE lines from boards See merge request gitlab-org/gitlab-ce!19486
| * | | | | | | Port of EE refactoring to extract EE lines from boardsPaul Slaughter2018-07-036-37/+93
| | | | | | | |
* | | | | | | | Merge branch 'update_shibboleth' into 'master'Rémy Coutable2018-07-054-12/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update OmniAuth Shibboleth gem to latest See merge request gitlab-org/gitlab-ce!20354
| * | | | | | | | Update OmniAuth Shibboleth gem to latest to gain supportTom Downes2018-07-044-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for handling multi-valued SAML assertions. Add documentation of label argument for omniauth provider to override text in login button.
* | | | | | | | | Merge branch '48853-failing-eslint-on-master' into 'master'Rémy Coutable2018-07-051-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Failing ESLint on master" Closes #48853 See merge request gitlab-org/gitlab-ce!20384
View Lorry Controller Status