Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed deleting new files creating wrong state in IDEide-delete-new-files-state | Phil Hughes | 2018-08-15 | 3 | -1/+38 |
| | | | | Closes #50255 | ||||
* | Merge branch 'docs-junit-test-reports' into 'master' | Marcia Ramos | 2018-08-15 | 6 | -2/+154 |
|\ | | | | | | | | | | | | | Documentation for JUnit XML Test Summary In MR widget Closes #49867 See merge request gitlab-org/gitlab-ce!21061 | ||||
| * | Documentation for JUnit XML Test Summary In MR widget | Shinya Maeda | 2018-08-15 | 6 | -2/+154 |
|/ | |||||
* | Merge branch 'port-i18n-for-mirrors-instructions' into 'master' | Douwe Maan | 2018-08-15 | 2 | -4/+1 |
|\ | | | | | | | | | Port EE changes for mirrors/_instructions.html.haml See merge request gitlab-org/gitlab-ce!21107 | ||||
| * | regenerate .pot | Luke Bennett | 2018-08-14 | 1 | -3/+0 |
| | | |||||
| * | Merge branch 'master' into 'port-i18n-for-mirrors-instructions' | Lin Jen-Shin | 2018-08-10 | 133 | -853/+2135 |
| |\ | | | | | | | | | | # Conflicts: # app/views/projects/mirrors/_instructions.html.haml | ||||
| * | | Update gitlab.pot | Lin Jen-Shin | 2018-08-09 | 1 | -0/+12 |
| | | | |||||
| * | | Port EE changes | Lin Jen-Shin | 2018-08-09 | 1 | -7/+8 |
| | | | |||||
* | | | Merge branch 'add-user_show_add_ssh_key_message-application-setting' into ↵ | Nick Thomas | 2018-08-15 | 11 | -6/+79 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add a "user_show_add_ssh_key_message" application setting for use with SSH certificates Closes #49953 See merge request gitlab-org/gitlab-ce!21027 | ||||
| * | | | Add ability suppress the global "You won't be able [use] SSH" message | Ævar Arnfjörð Bjarmason | 2018-08-08 | 11 | -6/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes gitlab-org/gitlab-ce#49953, as noted in the documentation this feature is intended to be used when SSH certificates are enabled. Then this warning becomes not only pointless, but also misleading. This builds on top of gitlab-org/gitlab-ce!21009 since both need to modify the same documentation, which avoids a merge conflict. See also the gitlab-org/gitlab-ce#49218 issue and associated merge request. | ||||
* | | | | Merge branch '6541-custom-favicons-not-being-replicated-by-geo' into 'master' | Nick Thomas | 2018-08-15 | 2 | -0/+9 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6860 See merge request gitlab-org/gitlab-ce!21200 | ||||
| * | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6860 | Valery Sizov | 2018-08-14 | 2 | -0/+9 |
| | | | | | |||||
* | | | | | Merge branch '50101-aritfacts-block' into 'master'50193-enable-auto-devops-instance-wide-on-gitlab-com | Phil Hughes | 2018-08-15 | 4 | -0/+241 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Creates vue component for artifacts block See merge request gitlab-org/gitlab-ce!21198 | ||||
| * | | | | | Creates vue component for artifacts block | Filipa Lacerda | 2018-08-15 | 4 | -0/+241 |
|/ / / / / | |||||
* | | | | | Merge branch 'docs-update-system-hooks-api' into 'master' | Sean McGivern | 2018-08-15 | 1 | -1/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | chore(docs): add field repository_update_events See merge request gitlab-org/gitlab-ce!21205 | ||||
| * | | | | | chore(docs): add field repository_update_events | Jens Goldhammer | 2018-08-14 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | - adds the field repository_update_events as json field | ||||
* | | | | | | Merge branch 'mk/bump-rainbow-gem' into 'master' | James Lopez | 2018-08-15 | 6 | -12/+17 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `bin/secpick` rainbow gem error, and security branch prefixing See merge request gitlab-org/gitlab-ce!21210 | ||||
| * | | | | | | Fix `bin/secpick` rainbow gem error, and security branch prefixing | Michael Kozono | 2018-08-15 | 6 | -12/+17 |
|/ / / / / / | |||||
* | | | | | | Merge branch '50281-js-pages-do-not-load-on-windows-8-ie-11' into 'master' | Tim Zallmann | 2018-08-15 | 2 | -0/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "JS Pages do not load on windows 8, IE 11" Closes #50281 See merge request gitlab-org/gitlab-ce!21214 | ||||
| * | | | | | | add CHANGELOG.md entry for !21214 | Mike Greiling | 2018-08-15 | 1 | -0/+5 |
| | | | | | | | |||||
| * | | | | | | add polyfill for String.prototype.includes | Mike Greiling | 2018-08-15 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'auto-devops-gitlab-ci-glic-228' into 'master' | Grzegorz Bizon | 2018-08-15 | 2 | -3/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vendor in Auto-DevOps.gitlab-ci.yml to update glibc to 2.28 Closes #50294 See merge request gitlab-org/gitlab-ce!21191 | ||||
| * | | | | | | | Vendor in Auto-DevOps.gitlab-ci.yml to update glibc to 2.28 | Thong Kuah | 2018-08-15 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vendored from https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/186 Thanks @sgerrand ! | ||||
* | | | | | | | | Merge branch 'tz-mr-incremental-rendering' into 'master' | Mike Greiling | 2018-08-15 | 11 | -10/+121 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR Page incremental rendering See merge request gitlab-org/gitlab-ce!21063 | ||||
| * | | | | | | | | Added compute property to diff file + changed a for loop | Tim Zallmann | 2018-08-14 | 2 | -2/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Added the actual description | Tim Zallmann | 2018-08-13 | 1 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Added Changelog | Tim Zallmann | 2018-08-13 | 1 | -0/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed ESLint error | Tim Zallmann | 2018-08-13 | 1 | -3/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Added constants for Render values + Optimised for Loop | Tim Zallmann | 2018-08-13 | 3 | -8/+39 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix broken spec checking for extinct element | André Luís | 2018-08-08 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed text removal memory saving + Fixed collapsed non text files | Tim Zallmann | 2018-08-08 | 3 | -10/+19 |
| | | | | | | | | | |||||
| * | | | | | | | | Memory savings on diffLine Object | Tim Zallmann | 2018-08-08 | 1 | -0/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix for displaying loading when collapsed | Tim Zallmann | 2018-08-08 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix for diff_file specs | Tim Zallmann | 2018-08-08 | 2 | -1/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | ESLint Fixes | Tim Zallmann | 2018-08-08 | 3 | -3/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Incremental Rendering of the MR | Tim Zallmann | 2018-08-08 | 5 | -7/+51 |
| | | | | | | | | | |||||
| * | | | | | | | | Reset Tooltip directive Init + Fixed Karma Test | Tim Zallmann | 2018-08-08 | 1 | -4/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Changed the if order to get perhaps even a little bit more out of it | Tim Zallmann | 2018-08-08 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Button with Icon only rendered when hovered, deferred lazy Image checking + ↵ | Tim Zallmann | 2018-08-08 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ImageViewer + Tooltip | ||||
| * | | | | | | | | First port of the performance improvements | Tim Zallmann | 2018-08-08 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '5300/ccr/elasticsearch_index' into 'master' | Sean McGivern | 2018-08-15 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified find project method to return nil if project not found See merge request gitlab-org/gitlab-ce!21168 | ||||
| * | | | | | | | | | Modified find project method to return nil if project not found | Chantal Rollison | 2018-08-14 | 1 | -0/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch '49905-fix-checkboxes-runners' into 'master'50323-fix-bad-test-from-resolve-chart-versions-for-applications-installed-by-one-click-install-buttons-should-be-version-locked-250323-fix-bad-test-from-resolve-chart-versions-for-applications-installed-by-one-click-install-buttons-should-be-version-locked | Mike Greiling | 2018-08-15 | 3 | -15/+50 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clicking on the text of checkboxes of runner's settings should toggle the checkbox" Closes #49905 See merge request gitlab-org/gitlab-ce!21165 | ||||
| * | | | | | | | | | Resolve "Clicking on the text of checkboxes of runner's settings should ↵ | Filipa Lacerda | 2018-08-15 | 3 | -15/+50 |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | toggle the checkbox" | ||||
* | | | | | | | | | Merge branch '50180-fa-icon-google-audit' into 'master' | Stan Hu | 2018-08-14 | 3 | -0/+27 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Profile audit log does not show Google icon properly" Closes #50180 See merge request gitlab-org/gitlab-ce!21207 | ||||
| * | | | | | | | | Fix rubocop offense | Jan Beckmann | 2018-08-14 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Add merge request number to changelog | Jan Beckmann | 2018-08-14 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix missing Google icon in audit log | Jan Beckmann | 2018-08-14 | 3 | -0/+27 |
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes #50180 | ||||
* | | | | | | | | Merge branch 'expose-all-artifacts-sizes-in-jobs-api' into 'master' | Kamil Trzciński | 2018-08-14 | 6 | -17/+102 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Expose all artifacts sizes in jobs api See merge request gitlab-org/gitlab-ce!20821 | ||||
| * | | | | | | | Expose all artifacts sizes in jobs api | Peter Marko | 2018-08-14 | 6 | -11/+102 |
| | | | | | | | |