summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | notes.js: also return the original content when getting form dataBen Boeckel2017-10-191-1/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Create new branch from dropdown.Jacob Schatz2017-10-237-9/+196
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'zj-peek-gitaly' into 'master'Rémy Coutable2017-10-231-0/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show Gitaly data in the peek performance bar Closes #39231 See merge request gitlab-org/gitlab-ce!14949
| * | | | | | | | | Add Gitaly data to the Peek performance barZeger-Jan van de Weg2017-10-231-0/+7
| | | | | | | | | |
* | | | | | | | | | Merge branch 'add-shared-vue-loading-button' into 'master'Filipa Lacerda2017-10-235-5/+86
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add loading button See merge request gitlab-org/gitlab-ce!14883
| * | | | | | | | | Add loading buttonadd-shared-vue-loading-buttonEric Eastwood2017-10-235-5/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encompasses designs from - https://gitlab.com/gitlab-org/gitlab-ce/issues/23206#note_43355199 - https://gitlab.com/gitlab-org/gitlab-ce/issues/29985#note_30417407
* | | | | | | | | | Merge branch '38869-diff' into 'master'Phil Hughes2017-10-235-23/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Diff class from global namespace See merge request gitlab-org/gitlab-ce!14965
| * | | | | | | | | | Remove Diff class from globalnamespaceFilipa Lacerda2017-10-195-23/+16
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'sh-fix-container-registry-destroy' into 'master'Filipa Lacerda2017-10-231-4/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deletion of container registry or images returning an error Closes #39354 See merge request gitlab-org/gitlab-ce!14992
| * | | | | | | | | | | Fix deletion of container registry or images returning an errorStan Hu2017-10-231-4/+2
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A successful DELETE call would result in a 204 No Content result, which would have an empty response body. Don't automatically try to parse this value as JSON both because there is no additional information passed in the response body. Closes #39354
* | | | | | | | | | | Merge branch 'bvl-fix-group-atom-feed' into 'master'Douwe Maan2017-10-221-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we render events for projects within a group Closes #39305 See merge request gitlab-org/gitlab-ce!14974
| * | | | | | | | | | Make sure we render events for projects within a groupBob Van Landuyt2017-10-201-0/+11
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Fix the external URLs generated for online view of HTML artifactsNick Thomas2017-10-201-6/+11
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'multi-file-editor-submodules' into 'master'Filipa Lacerda2017-10-204-3/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added submodule support in multi-file editor See merge request gitlab-org/gitlab-ce!14971
| * | | | | | | | | Added submodule support in multi-file editorPhil Hughes2017-10-204-3/+26
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Use title as placeholder instead of issue title for reusabilityClement Ho2017-10-201-4/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-application-setting-nil-cache' into 'master'Winnie Hellmann2017-10-201-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent ApplicationSetting to cache nil value Closes #39275 See merge request gitlab-org/gitlab-ce!14952
| * | | | | | | | | Prevent ApplicationSetting to cache nil valueKamil Trzcinski2017-10-191-1/+4
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | URI decode Page-Title header to preserve UTF-8 charactersToon Claes2017-10-202-2/+2
| | | | | | | | |
* | | | | | | | | Decrease Perceived Complexity threshold to 14Maxim Rydkin2017-10-201-8/+21
| | | | | | | | |
* | | | | | | | | Resolve "Remove help text regarding group issues on group issues page (and ↵Victor Wu2017-10-202-14/+0
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | group merge requests page)"
* | | | | | | | Force non diff resolved discussion to display when collapse toggledClement Ho2017-10-201-1/+1
| | | | | | | |
* | | | | | | | Merge branch '37391-wiki-disk-path-helper' into 'master'Nick Thomas2017-10-201-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Use wiki.disk_path See merge request gitlab-org/gitlab-ce!14930
| * | | | | | | Use wiki.disk_pathNick Thomas2017-10-181-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'animate-auto-devops' into 'master'Annabel Dunstone Gray2017-10-202-2/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Animate auto devops graphic Closes #39242 See merge request gitlab-org/gitlab-ce!14931
| * | | | | | | | Animate auto devops graphicanimate-auto-devopsClement Ho2017-10-182-2/+13
| | | | | | | | |
* | | | | | | | | Merge branch 'update-nav-sidebar-hover' into 'master'Annabel Dunstone Gray2017-10-191-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update nav sidebar hover color to increase contrast Closes #37660 See merge request gitlab-org/gitlab-ce!14829
| * | | | | | | | update nav sidebar hover color to increase contrastupdate-nav-sidebar-hovertauriedavis2017-10-111-3/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'not-found-in-commits' into 'master'Douwe Maan2017-10-191-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renders 404 in commits controller if no commits are found Closes #37620 See merge request gitlab-org/gitlab-ce!14610
| * | | | | | | | | Renders 404 in commits controller if no commits are foundGuilherme Vieira2017-10-181-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'sh-fix-broken-docker-delete' into 'master'Grzegorz Bizon2017-10-193-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inability to delete container registry tags Closes #39260 See merge request gitlab-org/gitlab-ce!14947
| * | | | | | | | | | Fix broken function invocationsh-fix-broken-docker-deleteFilipa Lacerda2017-10-192-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix inability to delete container registry tagsStan Hu2017-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because container registry tags can have periods, the addition of the `.json` format caused ambiguity. Since the tag name regex is greedy, it would attempt to locate an image named `foo.json` instead of `foo`. Closes #39260
* | | | | | | | | | | Merge branch '38648-members-sidebar' into 'master'Phil Hughes2017-10-191-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add members flyout on collapsed sidebar Closes #38648 See merge request gitlab-org/gitlab-ce!14942
| * | | | | | | | | | | Add members flyout on collapsed sidebar38648-members-sidebarAnnabel Dunstone Gray2017-10-181-0/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Remove dropzoneInput from global namespaceFilipa Lacerda2017-10-195-306/+268
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch '36160-zindex' into 'master'Annabel Dunstone Gray2017-10-181-0/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decreases z-index of select2 to a lower number of our navigation bar Closes #36160 See merge request gitlab-org/gitlab-ce!14925
| * | | | | | | | | Decreases z-index of select2 to a lower number of our navigation bar36160-zindexFilipa Lacerda2017-10-181-0/+5
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pms-fix-tooltip-padding' into 'master'Annabel Dunstone Gray2017-10-181-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix tooltip padding to align to 8px grid See merge request gitlab-org/gitlab-ce!14928
| * | | | | | | | Fix tooltip padding to align to 8px gridpms-fix-tooltip-paddingPedro Moreira da Silva2017-10-181-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'bvl-fix-locale-path' into 'master'Tim Zallmann2017-10-182-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render region codes for locale assets with an `_` instead of a `-` Closes #39225 See merge request gitlab-org/gitlab-ce!14924
| * | | | | | | | | Build the locale path with an `_` instead of a `-`Bob Van Landuyt2017-10-182-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The locale code is turned into an asset path with an underscore instead of a dash. The language codes are transformed by `I18n.locale` into a code with a dash. But the resources for translating are always stored in a path using a `_` separating the language and the region code.
* | | | | | | | | | Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master'Tim Zallmann2017-10-181-8/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add lazy option to UserAvatarImage See merge request gitlab-org/gitlab-ce!14895
| * | | | | | | | | | Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-componentEric Eastwood2017-10-171-8/+23
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Fix resolved discussions not expanding on side by side viewClement Ho2017-10-181-2/+2
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Fix PikadayFilipa Lacerda2017-10-188-46/+70
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch '39201-improve-google-image' into 'master'35616-gke-1st-iterationPhil Hughes2017-10-182-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace google login image Closes #39201 See merge request gitlab-org/gitlab-ce!14919
| * | | | | | | | Replace google login image39201-improve-google-imageFilipa Lacerda2017-10-172-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-186-20/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport all fixes from GitLab 10.1 into master See merge request gitlab-org/gitlab-ce!14922
| * \ \ \ \ \ \ \ \ Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-17105-1340/+2337
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |