Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | i18n: externalize strings from 'app/views/admin/groups' | Tao Wang | 2018-07-13 | 6 | -43/+39 |
| | | | | Signed-off-by: Tao Wang <twang2218@gmail.com> | ||||
* | Merge branch 'dz-manifest-import' into 'master' | Douwe Maan | 2018-07-12 | 7 | -39/+129 |
|\ | | | | | | | | | Add manifest import See merge request gitlab-org/gitlab-ce!20304 | ||||
| * | Fix CI/CD importdz-manifest-import | Dmitriy Zaporozhets | 2018-07-11 | 1 | -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 review | Dmitriy Zaporozhets | 2018-07-11 | 4 | -37/+28 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Improve manifest feature frontend after review | Dmitriy Zaporozhets | 2018-07-11 | 3 | -21/+26 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Rename button at manifest import form | Dmitriy Zaporozhets | 2018-07-11 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Move manifest import to separate page and add feature specs | Dmitriy Zaporozhets | 2018-07-11 | 3 | -9/+2 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix icon for manifest import and mention manifest feature in API | Dmitriy Zaporozhets | 2018-07-11 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add ability to disable manifest import | Dmitriy Zaporozhets | 2018-07-11 | 1 | -4/+5 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Improve manifest import logic | Dmitriy Zaporozhets | 2018-07-11 | 2 | -12/+13 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | More reliable manifest parser and group-only selector | Dmitriy Zaporozhets | 2018-07-11 | 1 | -5/+5 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add manifest import feature | Dmitriy Zaporozhets | 2018-07-11 | 5 | -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 Coutable | 2018-07-12 | 8 | -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 Wang | 2018-07-10 | 8 | -21/+21 |
| | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com> | ||||
* | | | Merge branch 'fix-mr-widget-border' into 'master' | Filipa Lacerda | 2018-07-11 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix MR widget border See merge request gitlab-org/gitlab-ce!20562 | ||||
| * | | | Fix MR widget border | Annabel Dunstone Gray | 2018-07-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Revert "Merge branch 'ee-5481-epic-todos' into 'master'" | Jarka Kadlecová | 2018-07-11 | 1 | -27/+21 |
|/ / / | | | | | | | | | | | | | This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489. | ||||
* | | | Milestone tests | Dan Davison | 2018-07-11 | 7 | -10/+10 |
| | | | |||||
* | | | Add Gitaly Servers to Admin > Overview menu49114-add-gitaly-servers-to-admin-overview-navigation-menu | Gabriel Mazetto | 2018-07-11 | 1 | -2/+6 |
| |/ |/| | |||||
* | | Fix a typo on CI Runner page on Projects | Ave | 2018-07-10 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'revert-3755d828' into 'master' | Phil Hughes | 2018-07-10 | 1 | -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 Hellmann | 2018-07-10 | 1 | -1/+1 |
| |/ | | | | | This reverts merge request !20140 | ||||
* | | Resolve "Disable GCP free credit banner at instance level" | Dennis Tang | 2018-07-10 | 2 | -0/+24 |
|/ | |||||
* | Support manually stopping any environment from the UI | Winnie Hellmann | 2018-07-10 | 5 | -14/+39 |
| | |||||
* | Merge branch 'upgrade-hamlit-for-ruby25' into 'master' | Rémy Coutable | 2018-07-09 | 1 | -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 #42045 | Matthew Dawson | 2018-07-08 | 1 | -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 disabled | Dustin Utecht | 2018-07-09 | 1 | -1/+3 |
|/ | |||||
* | Merge branch '46246-gitlab-project-export-should-use-object-storage' into ↵ | Sean McGivern | 2018-07-06 | 1 | -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 Lopez | 2018-07-06 | 1 | -1/+1 |
| | | |||||
* | | Use proper markdown rendering for previews | Brett Walker | 2018-07-06 | 7 | -7/+19 |
| | | |||||
* | | Merge branch 'rc-qa-146' into 'master' | Grzegorz Bizon | 2018-07-06 | 2 | -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 import | Rémy Coutable | 2018-07-06 | 2 | -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 Bennett | 2018-07-06 | 1 | -3/+10 |
| | | |||||
* | | Resolve "Add dropdown to Groups link in top bar" | Dennis Tang | 2018-07-06 | 3 | -12/+22 |
|/ | |||||
* | CE for "Remove new contributing link from EE" | Luke Bennett | 2018-07-06 | 2 | -5/+6 |
| | |||||
* | Fix User role displayed on projects dashboard | Francisco Javier López | 2018-07-06 | 1 | -1/+1 |
| | |||||
* | Merge branch 'ce-6145-unify-issuable-search-bar' into 'master' | Robert Speicher | 2018-07-05 | 2 | -5/+16 |
|\ | | | | | | | | | CE: Unify app/views/shared/issuable/_search_bar.html.haml See merge request gitlab-org/gitlab-ce!20266 | ||||
| * | Bring changes from EE | Lin Jen-Shin | 2018-07-05 | 1 | -2/+3 |
| | | |||||
| * | Make sure we're passing the board! | Lin Jen-Shin | 2018-07-05 | 1 | -1/+1 |
| | | | | | | | | I have no idea where the board was coming from previously | ||||
| * | Board might not exist | Lin Jen-Shin | 2018-07-05 | 1 | -2/+2 |
| | | |||||
| * | Unify app/views/shared/issuable/_search_bar.html.haml | Lin Jen-Shin | 2018-07-05 | 1 | -2/+12 |
| | | | | | | | | This brings some EE changes which don't hurt | ||||
* | | Merge branch 'go-code-cover' into 'master' | Kamil Trzciński | 2018-07-05 | 1 | -0/+3 |
|\ \ | | | | | | | | | | | | | Add Go code coverage See merge request gitlab-org/gitlab-ce!20359 | ||||
| * | | Add Go code coverage | Maxime Guyot | 2018-07-04 | 1 | -0/+3 |
| | | | |||||
* | | | Web Terminal Ci Build | Francisco Javier López | 2018-07-05 | 2 | -0/+15 |
| | | | |||||
* | | | fix double "in" in time to artifact deletion | Ben Bodenmiller | 2018-07-05 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'i18n-extract-app/views/projects-snippets' into 'master' | Rémy Coutable | 2018-07-05 | 5 | -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 Wang | 2018-07-01 | 5 | -24/+24 |
| | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com> | ||||
* | | | Close revoke deploy token modal on escape keypress | George Tsiolis | 2018-07-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '45738-add-environment-drop-down-to-metrics-dashboard' into ↵ | Phil Hughes | 2018-07-05 | 1 | -7/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add `environment` drop down to Metrics dashboard Closes #45738 See merge request gitlab-org/gitlab-ce!19833 | ||||
| * | | | populate environments dropdown, add tests | Jose | 2018-07-04 | 1 | -0/+1 |
| | | | |