summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed deleting new files creating wrong state in IDEide-delete-new-files-statePhil Hughes2018-08-153-1/+38
| | | | Closes #50255
* Merge branch 'docs-junit-test-reports' into 'master'Marcia Ramos2018-08-156-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 widgetShinya Maeda2018-08-156-2/+154
|/
* Merge branch 'port-i18n-for-mirrors-instructions' into 'master'Douwe Maan2018-08-152-4/+1
|\ | | | | | | | | Port EE changes for mirrors/_instructions.html.haml See merge request gitlab-org/gitlab-ce!21107
| * regenerate .potLuke Bennett2018-08-141-3/+0
| |
| * Merge branch 'master' into 'port-i18n-for-mirrors-instructions'Lin Jen-Shin2018-08-10133-853/+2135
| |\ | | | | | | | | | # Conflicts: # app/views/projects/mirrors/_instructions.html.haml
| * | Update gitlab.potLin Jen-Shin2018-08-091-0/+12
| | |
| * | Port EE changesLin Jen-Shin2018-08-091-7/+8
| | |
* | | Merge branch 'add-user_show_add_ssh_key_message-application-setting' into ↵Nick Thomas2018-08-1511-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ð Bjarmason2018-08-0811-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 Thomas2018-08-152-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/6860Valery Sizov2018-08-142-0/+9
| | | | |
* | | | | Merge branch '50101-aritfacts-block' into 'master'50193-enable-auto-devops-instance-wide-on-gitlab-comPhil Hughes2018-08-154-0/+241
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Creates vue component for artifacts block See merge request gitlab-org/gitlab-ce!21198
| * | | | | Creates vue component for artifacts blockFilipa Lacerda2018-08-154-0/+241
|/ / / / /
* | | | | Merge branch 'docs-update-system-hooks-api' into 'master'Sean McGivern2018-08-151-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 Goldhammer2018-08-141-1/+4
| | | | | | | | | | | | | | | | | | - adds the field repository_update_events as json field
* | | | | | Merge branch 'mk/bump-rainbow-gem' into 'master'James Lopez2018-08-156-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 prefixingMichael Kozono2018-08-156-12/+17
|/ / / / / /
* | | | | | Merge branch '50281-js-pages-do-not-load-on-windows-8-ie-11' into 'master'Tim Zallmann2018-08-152-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 !21214Mike Greiling2018-08-151-0/+5
| | | | | | |
| * | | | | | add polyfill for String.prototype.includesMike Greiling2018-08-151-0/+1
| | | | | | |
* | | | | | | Merge branch 'auto-devops-gitlab-ci-glic-228' into 'master'Grzegorz Bizon2018-08-152-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.28Thong Kuah2018-08-152-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 Greiling2018-08-1511-10/+121
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR Page incremental rendering See merge request gitlab-org/gitlab-ce!21063
| * | | | | | | | Added compute property to diff file + changed a for loopTim Zallmann2018-08-142-2/+5
| | | | | | | | |
| * | | | | | | | Added the actual descriptionTim Zallmann2018-08-131-3/+2
| | | | | | | | |
| * | | | | | | | Added ChangelogTim Zallmann2018-08-131-0/+5
| | | | | | | | |
| * | | | | | | | Fixed ESLint errorTim Zallmann2018-08-131-3/+0
| | | | | | | | |
| * | | | | | | | Added constants for Render values + Optimised for LoopTim Zallmann2018-08-133-8/+39
| | | | | | | | |
| * | | | | | | | Fix broken spec checking for extinct elementAndré Luís2018-08-081-1/+1
| | | | | | | | |
| * | | | | | | | Fixed text removal memory saving + Fixed collapsed non text filesTim Zallmann2018-08-083-10/+19
| | | | | | | | |
| * | | | | | | | Memory savings on diffLine ObjectTim Zallmann2018-08-081-0/+16
| | | | | | | | |
| * | | | | | | | Fix for displaying loading when collapsedTim Zallmann2018-08-081-1/+1
| | | | | | | | |
| * | | | | | | | Fix for diff_file specsTim Zallmann2018-08-082-1/+10
| | | | | | | | |
| * | | | | | | | ESLint FixesTim Zallmann2018-08-083-3/+1
| | | | | | | | |
| * | | | | | | | Incremental Rendering of the MRTim Zallmann2018-08-085-7/+51
| | | | | | | | |
| * | | | | | | | Reset Tooltip directive Init + Fixed Karma TestTim Zallmann2018-08-081-4/+2
| | | | | | | | |
| * | | | | | | | Changed the if order to get perhaps even a little bit more out of itTim Zallmann2018-08-081-1/+1
| | | | | | | | |
| * | | | | | | | Button with Icon only rendered when hovered, deferred lazy Image checking + ↵Tim Zallmann2018-08-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ImageViewer + Tooltip
| * | | | | | | | First port of the performance improvementsTim Zallmann2018-08-081-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '5300/ccr/elasticsearch_index' into 'master'Sean McGivern2018-08-151-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 foundChantal Rollison2018-08-141-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-lockedMike Greiling2018-08-153-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 Lacerda2018-08-153-15/+50
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | toggle the checkbox"
* | | | | | | | | Merge branch '50180-fa-icon-google-audit' into 'master'Stan Hu2018-08-143-0/+27
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Profile audit log does not show Google icon properly" Closes #50180 See merge request gitlab-org/gitlab-ce!21207
| * | | | | | | | Fix rubocop offenseJan Beckmann2018-08-141-2/+2
| | | | | | | | |
| * | | | | | | | Add merge request number to changelogJan Beckmann2018-08-141-1/+1
| | | | | | | | |
| * | | | | | | | Fix missing Google icon in audit logJan Beckmann2018-08-143-0/+27
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes #50180
* | | | | | | | Merge branch 'expose-all-artifacts-sizes-in-jobs-api' into 'master'Kamil Trzciński2018-08-146-17/+102
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Expose all artifacts sizes in jobs api See merge request gitlab-org/gitlab-ce!20821
| * | | | | | | Expose all artifacts sizes in jobs apiPeter Marko2018-08-146-11/+102
| | | | | | | |