summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* i18n: externalize strings from 'app/views/admin/groups'Tao Wang2018-07-136-43/+39
| | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* Merge branch 'dz-manifest-import' into 'master'Douwe Maan2018-07-127-39/+129
|\ | | | | | | | | Add manifest import See merge request gitlab-org/gitlab-ce!20304
| * Fix CI/CD importdz-manifest-importDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | | | | | It seems that fronted ci_cd_only variable must be a string Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Improve manifest feature after backend reviewDmitriy Zaporozhets2018-07-114-37/+28
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Improve manifest feature frontend after reviewDmitriy Zaporozhets2018-07-113-21/+26
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Rename button at manifest import formDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move manifest import to separate page and add feature specsDmitriy Zaporozhets2018-07-113-9/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix icon for manifest import and mention manifest feature in APIDmitriy Zaporozhets2018-07-111-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add ability to disable manifest importDmitriy Zaporozhets2018-07-111-4/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Improve manifest import logicDmitriy Zaporozhets2018-07-112-12/+13
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * More reliable manifest parser and group-only selectorDmitriy Zaporozhets2018-07-111-5/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add manifest import featureDmitriy Zaporozhets2018-07-115-12/+111
| | | | | | | | | | | | | | | | | | It allows user to automatically import multiple repositories with nested structure by uploading a manifest xml file. AOSP project was used as an example during development of this feature. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'i18n-extract-app/views/explore' into 'master'Rémy Coutable2018-07-128-21/+21
|\ \ | | | | | | | | | | | | i18n: externalize strings from 'app/views/explore' See merge request gitlab-org/gitlab-ce!19713
| * | i18n: externalize strings from 'app/views/explore'Tao Wang2018-07-108-21/+21
| | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | Merge branch 'fix-mr-widget-border' into 'master'Filipa Lacerda2018-07-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix MR widget border See merge request gitlab-org/gitlab-ce!20562
| * | | Fix MR widget borderAnnabel Dunstone Gray2018-07-111-1/+1
| | | |
* | | | Revert "Merge branch 'ee-5481-epic-todos' into 'master'"Jarka Kadlecová2018-07-111-27/+21
|/ / / | | | | | | | | | | | | This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489.
* | | Milestone testsDan Davison2018-07-117-10/+10
| | |
* | | Add Gitaly Servers to Admin > Overview menu49114-add-gitaly-servers-to-admin-overview-navigation-menuGabriel Mazetto2018-07-111-2/+6
| |/ |/|
* | Fix a typo on CI Runner page on ProjectsAve2018-07-101-1/+1
| |
* | Merge branch 'revert-3755d828' into 'master'Phil Hughes2018-07-101-1/+1
|\ \ | | | | | | | | | | | | Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'" See merge request gitlab-org/gitlab-ce!20525
| * | Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"Winnie Hellmann2018-07-101-1/+1
| |/ | | | | This reverts merge request !20140
* | Resolve "Disable GCP free credit banner at instance level"Dennis Tang2018-07-102-0/+24
|/
* Support manually stopping any environment from the UIWinnie Hellmann2018-07-105-14/+39
|
* Merge branch 'upgrade-hamlit-for-ruby25' into 'master'Rémy Coutable2018-07-091-2/+2
|\ | | | | | | | | | | | | Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045 Closes #42045 See merge request gitlab-org/gitlab-ce!20315
| * Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045Matthew Dawson2018-07-081-2/+2
| | | | | | | | | | Also update the hook logs to escape the contents properly, as the :plain filter does not do html escaping.
* | Show "Sign in" instead of "Sign in / Register" when sign up is disabledDustin Utecht2018-07-091-1/+3
|/
* Merge branch '46246-gitlab-project-export-should-use-object-storage' into ↵Sean McGivern2018-07-061-1/+1
|\ | | | | | | | | | | | | | | | | 'master' Resolve "GitLab Project export should use object storage" Closes #46246 See merge request gitlab-org/gitlab-ce!20105
| * Update Import/Export to use object storage (based on aa feature flag)James Lopez2018-07-061-1/+1
| |
* | Use proper markdown rendering for previewsBrett Walker2018-07-067-7/+19
| |
* | Merge branch 'rc-qa-146' into 'master'Grzegorz Bizon2018-07-062-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Add a new scenario to test GitHub import Closes gitlab-qa#146 See merge request gitlab-org/gitlab-ce!19555
| * | [QA] Add a new scenario to test GitHub importRémy Coutable2018-07-062-3/+3
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | (Part 2) Resolve "Recognise when a user is trying to validate a private SSH key"Luke Bennett2018-07-061-3/+10
| |
* | Resolve "Add dropdown to Groups link in top bar"Dennis Tang2018-07-063-12/+22
|/
* CE for "Remove new contributing link from EE"Luke Bennett2018-07-062-5/+6
|
* Fix User role displayed on projects dashboardFrancisco Javier López2018-07-061-1/+1
|
* Merge branch 'ce-6145-unify-issuable-search-bar' into 'master'Robert Speicher2018-07-052-5/+16
|\ | | | | | | | | CE: Unify app/views/shared/issuable/_search_bar.html.haml See merge request gitlab-org/gitlab-ce!20266
| * Bring changes from EELin Jen-Shin2018-07-051-2/+3
| |
| * Make sure we're passing the board!Lin Jen-Shin2018-07-051-1/+1
| | | | | | | | I have no idea where the board was coming from previously
| * Board might not existLin Jen-Shin2018-07-051-2/+2
| |
| * Unify app/views/shared/issuable/_search_bar.html.hamlLin Jen-Shin2018-07-051-2/+12
| | | | | | | | This brings some EE changes which don't hurt
* | Merge branch 'go-code-cover' into 'master'Kamil Trzciński2018-07-051-0/+3
|\ \ | | | | | | | | | | | | Add Go code coverage See merge request gitlab-org/gitlab-ce!20359
| * | Add Go code coverageMaxime Guyot2018-07-041-0/+3
| | |
* | | Web Terminal Ci BuildFrancisco Javier López2018-07-052-0/+15
| | |
* | | fix double "in" in time to artifact deletionBen Bodenmiller2018-07-051-2/+2
| | |
* | | Merge branch 'i18n-extract-app/views/projects-snippets' into 'master'Rémy Coutable2018-07-055-24/+24
|\ \ \ | |_|/ |/| | | | | | | | i18n: externalize strings from 'app/views/projects/snippets' See merge request gitlab-org/gitlab-ce!19828
| * | i18n: externalize strings from 'app/views/projects/snippets'Tao Wang2018-07-015-24/+24
| | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | Close revoke deploy token modal on escape keypressGeorge Tsiolis2018-07-051-1/+1
| | |
* | | Merge branch '45738-add-environment-drop-down-to-metrics-dashboard' into ↵Phil Hughes2018-07-051-7/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add `environment` drop down to Metrics dashboard Closes #45738 See merge request gitlab-org/gitlab-ce!19833
| * | | populate environments dropdown, add testsJose2018-07-041-0/+1
| | | |