summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Enable frozen string in rest of app/models/**/*.rbgfyoung2018-08-1055-14/+122
| | | | Partially addresses #47424.
* Merge branch '49375-move-reports-code' into 'master'Phil Hughes2018-08-0911-16/+14
|\ | | | | | | | | Moves reports components to the reports folder See merge request gitlab-org/gitlab-ce!21069
| * Moves report components to reports folderFilipa Lacerda2018-08-0711-16/+14
| |
* | Add default avatar to groupGeorge Tsiolis2018-08-095-32/+34
| |
* | Merge branch 'ide-open-empty-merge-request' into 'master'Filipa Lacerda2018-08-092-4/+5
|\ \ | | | | | | | | | | | | | | | | | | Allow the Web IDE to open empty merge requests Closes #48166 See merge request gitlab-org/gitlab-ce!21102
| * | removed un-used commits for currentProject & currentBranchIdPhil Hughes2018-08-091-3/+0
| | |
| * | Allow the Web IDE to open empty merge requestsPhil Hughes2018-08-091-1/+5
| | | | | | | | | | | | Closes #48166
* | | Fix label item height when no descLuke Bennett2018-08-091-1/+2
| | |
* | | Merge branch 'frozen-string-enable-app-models-even-more' into 'master'Stan Hu2018-08-08101-2/+205
|\ \ \ | | | | | | | | | | | | | | | | Enable more frozen string in app/models/**/*.rb See merge request gitlab-org/gitlab-ce!21019
| * | | Enable more frozen string in app/models/**/*.rbgfyoung2018-08-07101-2/+205
| | | | | | | | | | | | | | | | Partially addresses #47424.
* | | | Merge branch '35952-keep-project-repository-settings-open-after-submit' into ↵Tim Zallmann2018-08-0812-19/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Keep project repository settings sections expanded after submitting form See merge request gitlab-org/gitlab-ce!21082
| * | | | ensure all project repository settings panels remain open after form submissionMike Greiling2018-08-0812-19/+21
| | | | |
* | | | | Keep project settings sections expanded after submitting formMike Greiling2018-08-084-8/+12
| | | | |
* | | | | Merge branch '35952-keep-group-settings-open-after-submit' into 'master'Tim Zallmann2018-08-083-1/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Keep group settings sections expanded after submitting form See merge request gitlab-org/gitlab-ce!21083
| * | | | ensure all group settings panels remain open after form submissionMike Greiling2018-08-083-1/+3
| |/ / /
* | | | Merge branch 'sh-fix-oauth-link-to-message' into 'master'Rémy Coutable2018-08-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix broken text in OAuth authorization screen See merge request gitlab-org/gitlab-ce!21080
| * | | | Fix broken text in OAuth authorization screenStan Hu2018-08-071-1/+1
| | | | |
* | | | | Porting MR Vue Memory Fixes to current masterTim Zallmann2018-08-0814-83/+195
| | | | |
* | | | | Resolve "Group dashboard > Line height is too tall for group names"Adriel Santiago2018-08-073-55/+75
| | | | |
* | | | | Merge branch '35952-keep-project-cicd-settings-open-after-submit' into 'master'Tim Zallmann2018-08-074-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Keep project CI/CD settings sections expanded after submitting form See merge request gitlab-org/gitlab-ce!21077
| * | | | | keep pipeline triggers settings panel open after form submissionMike Greiling2018-08-071-5/+5
| | | | | |
| * | | | | keep cicd runner settings panel open after form submissionMike Greiling2018-08-071-3/+3
| | | | | |
| * | | | | keep general pipeline settings panel open after form submissionMike Greiling2018-08-071-1/+1
| | | | | |
| * | | | | keep auto devops settings panel open after form submissionMike Greiling2018-08-071-1/+1
| | |/ / / | |/| | |
* | | | | Don't set gon variables in JSON requestsPeter Leitzen2018-08-071-2/+6
| | | | |
* | | | | Merge branch 'winh-restyle-user-status' into 'master'Mike Greiling2018-08-078-37/+162
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Restyle status message input on profile settings Closes #49645 See merge request gitlab-org/gitlab-ce!20903
| * | | | Restyle status message input on profile settingsWinnie Hellmann2018-08-078-37/+162
| | | | |
* | | | | Resolve "Board label edit drop down is showing incorrect selected labels ↵Constance Okoghenun2018-08-074-6/+29
| | | | | | | | | | | | | | | | | | | | summary"
* | | | | Fix UI error whereby prometheus application status is updatedClement Ho2018-08-074-33/+39
| | | | |
* | | | | Merge branch 'osw-fix-missing-and-duplicated-milestones-on-list' into 'master'Sean McGivern2018-08-073-17/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing and duplicates on project milestone listing page Closes #37078 See merge request gitlab-org/gitlab-ce!21058
| * | | | | Fix missing and duplicates on project milestone listing pageOswaldo Ferreira2018-08-073-17/+21
| | | | | |
* | | | | | Backport issue board milestone lists EE changesOswaldo Ferreira2018-08-074-8/+31
| | | | | |
* | | | | | Merge branch 'ide-fixed-height-sidebar' into 'master'Filipa Lacerda2018-08-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the height of the tree list in the Web IDE See merge request gitlab-org/gitlab-ce!21068
| * | | | | | Fixed the height of the tree list in the Web IDEPhil Hughes2018-08-071-1/+1
| | | | | | |
* | | | | | | Merge branch 'ce-5666-backport' into 'master'Yorick Peterse2018-08-072-6/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of "List groups with developer maintainer access on project creation" See merge request gitlab-org/gitlab-ce!21051
| * | | | | | | CE port of "List groups with developer maintainer access on project creation"Imre Farkas2018-08-072-6/+11
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Create Web IDE MR and branch pickerPaul Slaughter2018-08-0728-218/+736
| | | | | | |
* | | | | | | Merge branch 'improve-junit-support-be' into 'master'Kamil Trzciński2018-08-075-32/+66
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve JUnit test reports in merge request widgets Closes #49966 See merge request gitlab-org/gitlab-ce!21039
| * | | | | | Squashed commit of the following:Shinya Maeda2018-08-075-32/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 610c02c305d9fb3c7d271883450a5fee8b0cf16f Merge: f2088edb260 84f24dcef0d Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 23:01:38 2018 +0900 Merge branch 'master-ce' into improve-junit-support-be commit f2088edb26008e5791b7be86fc02fc470c881143 Merge: c67e1d32cac 339f47abec1 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 21:52:10 2018 +0900 Merge branch 'improve-junit-support-be' of gitlab.com:gitlab-org/gitlab-ce into improve-junit-support-be commit c67e1d32cac731b895e2f49a24ce0e1726b8196c Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 21:51:39 2018 +0900 Remove debuggable fixtures commit 339f47abec1d0ce815e6103a087902d71d8ff5be Merge: 7a33a9be724 96b748fbcc0 Author: Filipa Lacerda <filipa@gitlab.com> Date: Tue Aug 7 11:10:18 2018 +0100 Merge branch 'improve-junit-support-be' of https://gitlab.com/gitlab-org/gitlab-ce into improve-junit-support-be * 'improve-junit-support-be' of https://gitlab.com/gitlab-org/gitlab-ce: Add spec for latest Add spec for merge request Add spec for cache invalidation Add spec for pipeline Add spec Fix specs Support corrupted fixtures Add cache key to error message commit 7a33a9be724dbde79a24cec77658952ff2d2fa6c Author: Filipa Lacerda <filipa@gitlab.com> Date: Tue Aug 7 11:09:56 2018 +0100 Show resolved failures commit 96b748fbcc00a98a13aeb78f5d97de9cf25035b6 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 18:50:05 2018 +0900 Add spec for latest commit 0e8b024169b4b0ac272331117ac2fa821c4052f7 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 18:24:38 2018 +0900 Add spec for merge request commit 8690a699bc98394ad4deebdc91e6690758c5965e Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 18:18:55 2018 +0900 Add spec for cache invalidation commit 97678e1612826af409ca8a04b6c0dc830f7b66c6 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 18:01:03 2018 +0900 Add spec for pipeline commit 96c2a698af049e4026c68e74b1f41a265464b2b2 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 17:52:21 2018 +0900 Add spec commit 67bcbd25a3c13abb78ea43c0411f5aed417b87d0 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 17:39:02 2018 +0900 Fix specs commit d7d49def2023f85c07d2718b83f35c8849f65f05 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 13:11:07 2018 +0900 Support corrupted fixtures commit d58dbbc17a7d954db22082615f5331c148c1061b Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 13:10:47 2018 +0900 Add cache key to error message commit f6f976216dc36333b5e05e3f0acdfca689350483 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Aug 2 19:07:46 2018 +0900 bring back debaggable fixtures commit 48a7800e67a718145c0e88c324c0c1f9619e26a4 Merge: 2822b9e8a36 dd627072b3f Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 09:22:22 2018 +0900 Merge branch 'master-ce' into improve-junit-support-be commit 2822b9e8a369162d098a72a58803c8494b2343cd Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 22:54:47 2018 +0900 Move cache invalidation policy to outside of reactive cache commit b35efb1764ae61bb31dacbf79dbc022dcee3a203 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 22:34:10 2018 +0900 ADd reactive cache an ability to invalite cache commit feafee6f8a50f4a32866d8ae768e99766b0b7c73 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 19:25:22 2018 +0900 Pipeline has test reports if latest builds have any commit f302dbb73abe03c6c431e7d52d526e28a1586fee Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 19:18:56 2018 +0900 Invalidate test reports cache if it's outdated commit 83adaca01a1ee1cd64cac86b6fa3d10e2e4e2b98 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 18:08:06 2018 +0900 Revert cache invalidation in expire pipeline cache worker commit ec3af5de4ca34e2e92ad6b97f29733d6c65062bc Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 15:13:47 2018 +0900 Fix feature spec commit 0db48805a1ba68763be0504eb57218bde2380e4b Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 14:07:46 2018 +0900 Change lifetime of test reports cache to 10 minutes commit 17f7e78bfe2188c349cda1ff90a3ea94d337461e Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 14:07:19 2018 +0900 Add changelog commit 89c87585ab7f5333a8139c02b330dd2caf0be31a Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 14:01:20 2018 +0900 Add feature spec commit 1120cfd7a9ab06105f2e763c375fab00922b7e0c Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 12:55:47 2018 +0900 Invalidate cache when pipeline status transits. Correct test reports from the latest builds
* | | | | | | Merge branch 'kp-6927-epic-dates-from-milestone' into 'master'Phil Hughes2018-08-071-0/+7
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Add `tabindex` attribute support on Icon component to show BS4 popover on trigger `focus` See merge request gitlab-org/gitlab-ce!21066
| * | | | | | Add `tabindex` attribute support to show BS4 popover on trigger `focus`Kushal Pandya2018-08-071-0/+7
| | | | | | |
* | | | | | | Merge branch 'ide-codesandbox-poc' into 'master'Filipa Lacerda2018-08-0714-10/+447
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web IDE & Codesandbox POC Closes #47268 See merge request gitlab-org/gitlab-ce!19764
| * | | | | | | Web IDE & CodeSandboxPhil Hughes2018-08-0714-10/+447
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables JavaScripts projects to have live previews straight in the browser without requiring any local configuration. This uses the CodeSandbox package `sandpack` to compile it all inside of an iframe. This feature is off by default and can be toggled on in the admin settings. Only projects with a `package.json` and a `main` key are supported. Updates happen in real-time with hot-reloading. We just watch for changes to files and then send them to `sandpack` to allow it to reload the iframe. The iframe includes a very simple navigation bar, the text bar is `readonly` to stop users navigating away from the preview and the back and forward buttons just pop/splice the navigation stack which is tracked by a listener on `sandpack` There is a button inside the iframe which allows the user to open the projects inside of CodeSandbox. This button is only visible on **public** projects. On private or internal projects this button get hidden to protect private code being leaked into an external public URL. Closes #47268
* | | | | | | Merge branch 'winh-fix-gpg-regressions' into 'master'Rémy Coutable2018-08-073-3/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GPG status badge loading regressions Closes #49878, #49870, gitlab-org/quality/nightly#6 et #49831 See merge request gitlab-org/gitlab-ce!20987
| * | | | | | Fix GPG status badge loading regressionsWinnie Hellmann2018-08-073-3/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '49966-improve-junit-fe' into 'master'Phil Hughes2018-08-072-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Resolve "Improve JUnit support" See merge request gitlab-org/gitlab-ce!21067
| * | | | | Reset error state in success mutation to handle error-success stateFilipa Lacerda2018-08-071-0/+2
| | | | | |
| * | | | | Show resolved failuresFilipa Lacerda2018-08-071-1/+1
| | | | | |
* | | | | | Web IDE context header redesignPaul Slaughter2018-08-079-198/+163
|/ / / / /
* | | | | Resolve "Mutual SSL Auth For Helm TIller"Mayra Cabrera2018-08-076-9/+82
| | | | |