Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | SubmoduleHelper - Project is not always available as an instance variable49061-submodule-helper-fix | Mario de la Ossa | 2018-07-15 | 1 | -4/+4 |
| | |||||
* | Merge branch 'dz-manifest-import' into 'master' | Douwe Maan | 2018-07-12 | 1 | -4/+7 |
|\ | | | | | | | | | Add manifest import See merge request gitlab-org/gitlab-ce!20304 | ||||
| * | More reliable manifest parser and group-only selector | Dmitriy Zaporozhets | 2018-07-11 | 1 | -4/+7 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Revert "Merge branch 'ee-5481-epic-todos' into 'master'" | Jarka Kadlecová | 2018-07-11 | 2 | -22/+1 |
|/ | | | | | This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489. | ||||
* | Add daylight saving time support for pipeline schedules | Collen | 2018-07-10 | 1 | -1/+1 |
| | |||||
* | Resolve "Disable GCP free credit banner at instance level" | Dennis Tang | 2018-07-10 | 2 | -0/+2 |
| | |||||
* | Update time_helper.rb to fix output for exact minutes. | Marcel Amirault | 2018-07-10 | 1 | -2/+6 |
| | |||||
* | Use proper markdown rendering for previews | Brett Walker | 2018-07-06 | 3 | -1/+5 |
| | |||||
* | Merge branch 'bvl-wrap-cross-project-group-permissions' into 'master' | Douwe Maan | 2018-07-06 | 1 | -2/+4 |
|\ | | | | | | | | | Create cross project group features See merge request gitlab-org/gitlab-ce!20333 | ||||
| * | Create cross project group features | Bob Van Landuyt | 2018-07-06 | 1 | -2/+4 |
| | | | | | | | | | | This allows us to check specific abilities in views, while still enabling/disabling them at once. | ||||
* | | Fix User role displayed on projects dashboard | Francisco Javier López | 2018-07-06 | 2 | -0/+9 |
|/ | |||||
* | Merge branch 'ee-5481-epic-todos' into 'master' | Sean McGivern | 2018-07-04 | 2 | -1/+22 |
|\ | | | | | | | | | Port of Todos for epics See merge request gitlab-org/gitlab-ce!19908 | ||||
| * | Move group_dropdown_label to ce helper | Jarka Kadlecová | 2018-07-04 | 1 | -0/+13 |
| | | |||||
| * | More EE->CE fixes | Jan Provaznik | 2018-07-03 | 1 | -3/+1 |
| | | |||||
| * | Move todo_group_options to CE | Jan Provaznik | 2018-07-03 | 1 | -0/+10 |
| | | |||||
| * | Support todos for epics backport | Jarka Kadlecová | 2018-07-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'remove-is-shared-from-ci-runners' into 'master' | Grzegorz Bizon | 2018-07-04 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | Remove the use of `is_shared` of `Ci::Runner` See merge request gitlab-org/gitlab-ce!20172 | ||||
| * | Remove the use of `is_shared` of `Ci::Runner`remove-is-shared-from-ci-runners | Kamil Trzciński | 2018-06-26 | 1 | -1/+1 |
| | | |||||
* | | Add `&` support for epics autocompletion | Kushal Pandya | 2018-07-02 | 1 | -0/+1 |
| | | |||||
* | | Performance Improvements to Vue MR page | Tim Zallmann | 2018-06-30 | 1 | -1/+1 |
| | | |||||
* | | Fix merge requests data source key to be camelCase | Kushal Pandya | 2018-06-27 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'dev/master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+2 |
|\ \ | |||||
| * \ | Merge branch 'security-html_escape_usernames' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+2 |
| |\ \ | | |/ | |/| | | | | | | | [master] HTML escape the name of the user in ProjectsHelper#link_to_member See merge request gitlab/gitlabhq!2401 | ||||
| | * | HTML escape the name of the user in ProjectsHelper#link_to_member | Imre Farkas | 2018-06-15 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch 'kp-make-gfm-autocomplete-configurable' into 'master' | Phil Hughes | 2018-06-25 | 1 | -1/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | Make GFM Autocomplete configurable See merge request gitlab-org/gitlab-ce!20066 | ||||
| * | | | Add default autocomplete config | Kushal Pandya | 2018-06-25 | 1 | -1/+8 |
| |/ / | |||||
* | | | Update project sidebar to work with EE feature Security Dashboard | Olivier Gonzalez | 2018-06-25 | 1 | -0/+8 |
|/ / | |||||
* | | Changes tab VUE refactoring | Felipe Artur | 2018-06-21 | 2 | -3/+5 |
| | | |||||
* | | Backport code from gitlab-ee!6182 | Lukas Eipert | 2018-06-20 | 1 | -5/+42 |
| | | |||||
* | | More gitaly disk access blocks | Jacob Vosmaer (GitLab) | 2018-06-20 | 1 | -0/+1 |
| | | |||||
* | | Merge branch '46861-issuable-title-with-longer-username' into 'master' | Clement Ho | 2018-06-18 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | Buttons disappear on merge request page in some case Closes #46861 and #14348 See merge request gitlab-org/gitlab-ce!19176 | ||||
| * | Fix CSS for buttons not to be hidden on issues/MR title | Takuya Noguchi | 2018-06-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '47851-bump-cache-for-old-master-permission' into 'master' | Dmitriy Zaporozhets | 2018-06-14 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Resolve "Reference to master still cached" Closes #47851 See merge request gitlab-org/gitlab-ce!19827 | ||||
| * | | Flush cache for project list47851-bump-cache-for-old-master-permission | Mark Chao | 2018-06-14 | 1 | -1/+1 |
| | | | | | | | | | | | | For master->maintainer permission rename | ||||
* | | | Invalidate cache with project details when repository is updatedrd-33733-showing-created-date-instead-of-updated-date-in-project-lists | Rubén Dávila | 2018-06-13 | 1 | -0/+1 |
|/ / | | | | | | | | | The partial using this cache key was showing stale information due to the cache not being invalidated. | ||||
* | | Merge branch 'fix-loading-icon' into 'master' | Annabel Gray | 2018-06-08 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix loading icon in activity view Closes #47508 See merge request gitlab-org/gitlab-ce!19566 | ||||
| * | | Fix loading icon in activity viewfix-loading-icon | Clement Ho | 2018-06-07 | 1 | -1/+1 |
| | | | |||||
* | | | Fix tasks completed header | Clement Ho | 2018-06-07 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'feature/customizable-favicon' into 'master' | Douwe Maan | 2018-06-07 | 2 | -4/+8 |
|\ \ | | | | | | | | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497 | ||||
| * | | hint the allowed image formats on favicon upload | Alexis Reigel | 2018-06-06 | 1 | -0/+7 |
| | | | |||||
| * | | call Gitlab::Favicon.status in serializer | Alexis Reigel | 2018-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this ways we can keep the `lib/gitlab/ci/status/*` classes to return the bare favicon name as it was before. also the favicon uploader versions are now have the same names as the stock favicons (+ `favicon_` prefix), which makes working with the status names easier. | ||||
| * | | extract favicon logic to lib class | Alexis Reigel | 2018-06-05 | 2 | -9/+1 |
| | | | |||||
| * | | use custom main favicon | Alexis Reigel | 2018-06-05 | 2 | -0/+5 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into ↵ | Luke Bennett | 2018-06-06 | 3 | -7/+10 |
|\ \ \ | | | | | | | | | | | | | 39549-label-list-page-redesign-with-draggable-labels | ||||
| * \ \ | Merge branch 'blackst0ne-rails5-fix-specs-with-text-plain-charset-utf-8' ↵ | Rémy Coutable | 2018-06-06 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "[Rails5] Fix specs with "text/plain; charset=utf-8"" Closes #47378 See merge request gitlab-org/gitlab-ce!19462 | ||||
| | * | | | [Rails5] Fix response headers sending through workhorse | blackst0ne | 2018-06-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix invisible rows on importer status | Stan Hu | 2018-06-06 | 1 | -3/+3 |
| |/ / / | |||||
| * | | | Find and mark more Git disk access locations | Jacob Vosmaer (GitLab) | 2018-06-05 | 1 | -1/+4 |
| | | | | |||||
| * | | | Merge branch '42751-rename-mr-maintainer-push' into 'master' | Robert Speicher | 2018-06-05 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061 | ||||
| | * | | Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-push | Mark Chao | 2018-06-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751 |