Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
AgeCommit message (Collapse)Author
2018-04-03Merge branch 'jej/mattermost-notification-confidentiality' into 'security-10-4'Douwe Maan
Prevent notes on confidential issues from being sent to chat See merge request gitlab/gitlabhq!2248
2018-03-16Merge branch 'fj-15329-services-callbacks-ssrf-10-4' into 'security-10-4'Douwe Maan
[10.4] Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2347
2018-02-14Merge branch 'winh-new-branch-dropdown-style' into 'master'Phil Hughes
Cleanup new branch/merge request form in issues Closes #41938 See merge request gitlab-org/gitlab-ce!16854
2018-01-23Merge branch '42119-non-triggered' into 'master'Grzegorz Bizon
Resolve ""This job has not been triggered yet" after hitting "Retry"" Closes #42119 See merge request gitlab-org/gitlab-ce!16583 (cherry picked from commit b472411efb238ae223f99ecda067fa22d25bf8bb) a1f7b2bc Do not render non triggered empty state for pending jobs 30cfcd5a Update tests 63b93664 Adds information for pending state 4b8004c7 Improve pending case test c414ab84 Improve copy for the pending state
2018-01-23Merge branch 'tz-fix-ide-bugs' into 'master'Phil Hughes
WebIDE: Fix Commit bugs See merge request gitlab-org/gitlab-ce!16459
2018-01-22Merge branch 'issue_37143_2' into 'master'Sean McGivern
Remove unnecessary query from labels dropdown Closes #37143 See merge request gitlab-org/gitlab-ce!16520
2018-01-18Merge branch 'remove-ide-pref' into 'master'Tim Zallmann
Remove IDE option from user preferences See merge request gitlab-org/gitlab-ce!16454 (cherry picked from commit e56bcf92774b19115f62b609163c44ba9d919e69) af79397f Remove IDE option from user preferences 18abb303 remove specs
2018-01-17Merge branch '42046-fork-icon' into 'master'Fatih Acet
Resolve "Icons on forks page are to big" Closes #42046 See merge request gitlab-org/gitlab-ce!16474 (cherry picked from commit 78ca7d97bbb12be11bd2ebeb8b03ae2277c5ec10) d76047a1 fix fork icon size and button icon color on Forks page 3ec647ed Update 42046-fork-icon.yml
2018-01-17Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan
Backport authorized_keys Closes gitlab-ee#3953 See merge request gitlab-org/gitlab-ce!16014 (cherry picked from commit 2e4a1b3b78a76103198180acf873de8470d7cecf) ac86b204 Backport authorized_keys branch 'find-key-by-fingerprint' 255a0f85 Backport option to disable writing to `authorized_keys` file 07bd79cd Combine ssh docs and rename the doc bcffeade Use ApplicationSetting.current in Admin::ApplicationSettingsController 797fe0a6 Backport authorized_keys_enabled defaults to true' d2f4e8f9 Avoid adding index if already exists 01319e59 Make Gitlab::CurrentSettings available when getting settings d9557e43 Backport spec fixes in spec/lib/gitlab/shell_spec.rb 40e3d9f3 Fix typo in spec/requests/api/internal_spec.rb bd9ead68 Fix spec in shell_spec.rb 9edd9a5e Adds changelog for backport of authorized_keys DB lookup from EE
2018-01-17Merge branch '10-4-stable-prepare-rc6' into '10-4-stable'LUKE BENNETT
10.4.0-rc6 on rc5 sec release See merge request gitlab/gitlabhq!2310
2018-01-15Merge branch '41970-job-play-button' into 'master'Kamil Trzciński
Resolve "Empty state for manual job - play button does not work" Closes #41970 See merge request gitlab-org/gitlab-ce!16426
2018-01-15Merge branch 'disable-pages-on-jobs' into 'master'Yorick Peterse
Use simple Next/Prev paging for CI Jobs page Closes #41058 See merge request gitlab-org/gitlab-ce!16392
2018-01-15Merge branch 'merge-request-lfs-badge' into 'master'Douwe Maan
Added LFS badge to merge request files tracked by LFS Closes #41829 See merge request gitlab-org/gitlab-ce!16345
2018-01-15Merge branch '41789-fix-up-web-ide-user-preference-copy-and-buttons' into ↵Tim Zallmann
'master' Fix up Web IDE user preference copy and buttons Closes #41789 See merge request gitlab-org/gitlab-ce!16298
2018-01-15Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray
Fix 500 error when visiting a commit where the blobs do not exist (nil blobs) Closes #41491 See merge request gitlab-org/gitlab-ce!16237
2018-01-15Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into ↵Douwe Maan
'security-10-3' [10.3] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2276
2018-01-11Merge branch 'gcp-fix' into 'master'Kamil Trzciński
Fix GCP redirect Closes #41867 See merge request gitlab-org/gitlab-ce!16355 (cherry picked from commit 59adc07f00f4f3ea326194d77c31580edfdfb2a4) b44583e9 Extract GCP billing check as method cf6258af Fix billing checking 0cdd56e6 Fix link to billing e52bae3b Fix CheckGcpProjectBillingService spec b8b2f5ff Fix CheckGcpProjectBillingWorker spec 8ba3e473 Fix GCP Controller spec 1f0a4fe6 Add missing user agent header to GCP client 6ef28ace Add API requirements to docs 0b294fc2 Use new tab for link in flash cf95756a Refactor GCP redirect test suite e6012d3e Change failed GCP billing check wording 35598274 Fix breadcumb of clusters show page cf842986 Update links for GCP instructions
2018-01-11Merge branch '10-4-stable-missing-commits' into ↵Luke Bennett
10-4-stable-prepare-rc3-with-missing-commits
2018-01-10Merge branch 'changes-dropdown-ellipsis' into 'master'Sean McGivern
Fix changes dropdown ellipsis working across browsers Closes #41561 and #41684 See merge request gitlab-org/gitlab-ce!16281 (cherry picked from commit 8de1bb9e74a00766c663b1cdf8c7b49ddc060caf) 500a3de7 Fix changes dropdown ellipsis working across browsers
2018-01-08disables the shortcut to the issue boards when issues are disabledChristiaan Van den Poel
2018-01-06Merge branch 'master' into ↵Matija Čupić
39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
2018-01-06Merge branch '22643-manual-job-page' into 'master'Kamil Trzciński
Resolve "Improve non-triggered manual action job detail page" Closes #22643 and #37843 See merge request gitlab-org/gitlab-ce!15991
2018-01-06Fix invalid content of empty state.Kamil Trzciński
2018-01-06Merge branch '41249-clearing-the-cache' into 'master'Kamil Trzciński
Resolve "Clearing the cache" Closes #41249 See merge request gitlab-org/gitlab-ce!16067
2018-01-06Fix broken buildFilipa Lacerda
2018-01-05Merge branch 'master' into ↵Matija Čupić
39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
2018-01-05Fix broken templateFilipa Lacerda
2018-01-05Resolve "Helpful and instructing Empty state for multi file editor"Tim Zallmann
2018-01-05Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić
2018-01-05Changes after reviewFilipa Lacerda
2018-01-05Use --left-right and --max-count for counting diverging commitsLin Jen-Shin (godfat)
2018-01-05Merge branch 'jprovazn-rebase' into 'master'Filipa Lacerda
Backport 'Rebase' feature from EE to CE Closes #40301 See merge request gitlab-org/gitlab-ce!16071
2018-01-05Merge branch 'winh-modal-target-id' into 'master'Filipa Lacerda
Add id to modal.vue to support data-toggle="modal" Closes #41584 See merge request gitlab-org/gitlab-ce!16189
2018-01-05Merge branch 'refactor-cluster-show-page-conservative' into 'master'Filipa Lacerda
Refactor cluster show page Closes #41335 See merge request gitlab-org/gitlab-ce!16089
2018-01-05Add id to modal.vue to support data-toggle="modal"Winnie Hellmann
2018-01-05Backport 'Rebase' feature from EE to CEJan Provaznik
When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
2018-01-05Merge branch 'master' into ↵Matija Čupić
39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
2018-01-05Remove GCP cluster check page placeholderMatija Čupić
2018-01-05Add back bottom margins for integration formMatija Čupić
2018-01-05Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda
* master: (200 commits) Fix issue boards scroll config. Added multi editor setting on the profile preferences page fix missing import of timeWeek which would cause errors in prometheus graphs with deployments Remove downcase from special path helper Rename db:seed_fu-{pg,mysql} to gitlab:setup-{pg,mysql} Fix error when viewing diffs without blobs Moves prettier to dev dependency Eager load event target authors whenever possible Do not run ee_compat_check on security branches Include integration tests in CE/EE testing documentation 41054-Disallow creation of new Kubernetes integrations Resolve "Resizable file list and commit panel" Make tooltip placement bottom by default as per design guidelines Fix groups list icon, timestamp alignment and row height Avoid leaving a push event empty if payload cannot be created Move git operations for UpdateRemoteMirrorService into Gitlab::Git Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::Repository Move push_remote_branches from Gitlab::Shell to Gitlab::Git::Repository Update Kubernetes service documentation fix issue #37843 ...
2018-01-05Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić
2018-01-05Move cache reset to ci_cd_settings controllerMatija Čupić
2018-01-04Added multi editor setting on the profile preferences pageJose Ivan Vargas
2018-01-0441054-Disallow creation of new Kubernetes integrationsMayra Cabrera
2018-01-04Update Remove cluster subtitle and alertMatija Čupić
2018-01-04Update Advanced cluster settings subtitleMatija Čupić
2018-01-03Merge branch 'fix/move-2fa-disable-button' into 'master'Robert Speicher
Move 2FA disable button #35836 Closes #35836 See merge request gitlab-org/gitlab-ce!16177
2018-01-03Move 2FA disable buttonGeorge Tsiolis
- Removed disable button from /profile/account - Added disable button to /profile/two_factor_auth - Changed 2FA breadcrumb from 'User Settings > Account > Account' to 'User Settings > Account > Two-Factor Authentication'
2018-01-03Merge branch 'jramsay-4012-i18n-compare' into 'master'Douwe Maan
Add i18n helpers to branch comparison view See merge request gitlab-org/gitlab-ce!16031
2018-01-03Replace use of capture_haml with captureJames Ramsay