Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | :sparkles: use pre-existing components for title and descriptionide-merge-request-info | Phil Hughes | 2018-06-26 | 2 | -70/+70 |
* | Added merge request info to Web IDE sidebar | Phil Hughes | 2018-06-26 | 3 | -1/+122 |
* | Merge branch 'unify-some-models' into 'master' | Douwe Maan | 2018-06-26 | 2 | -1/+5 |
|\ | |||||
| * | Port Namespace#root_ancestor to CE | Lin Jen-Shin | 2018-06-26 | 1 | -0/+4 |
| * | Bring changes from EEunify-some-models | Lin Jen-Shin | 2018-06-26 | 1 | -1/+1 |
* | | Merge branch 'patch-28' into 'master' | Rémy Coutable | 2018-06-26 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix initial settings loading at the first run of GitLab installed from source | Andrei Vukolov | 2018-06-25 | 1 | -1/+1 |
| * | | Update wrong initial setting transfer in application_settings_controller.rb | Andrei Vukolov | 2018-06-21 | 1 | -1/+1 |
* | | | Merge branch 'dropdown-fix' into 'master' | Phil Hughes | 2018-06-26 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix for search dropdown scrollbar issue. | İsmail Hakkı Ayaz | 2018-06-19 | 1 | -1/+1 |
* | | | | Merge branch 'i18n-extract-app/views/shared-boards' into 'master' | Rémy Coutable | 2018-06-26 | 5 | -21/+21 |
|\ \ \ \ | |||||
| * | | | | i18n: externalize strings from 'app/views/shared/boards' | Tao Wang | 2018-06-16 | 5 | -21/+21 |
* | | | | | Merge branch 'update_project_flash_error_message' into 'master' | Rémy Coutable | 2018-06-26 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Set flash error message only for current request when updating project | Aram Visser | 2018-06-25 | 1 | -1/+1 |
* | | | | | | Merge branch 'existing-gcp-accounts' into 'master' | Mike Greiling | 2018-06-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add back copy for existing gcp accounts within offer bannerexisting-gcp-accounts | tauriedavis | 2018-06-25 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch '48339-sorting-by-name-on-explore-projects-page-renders-a-500-er... | Robert Speicher | 2018-06-25 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix sorting by name on explore projects page | Douglas Barbosa Alexandre | 2018-06-25 | 1 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'fix-alert-btn' into 'master' | Mike Greiling | 2018-06-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Do not style alert links that mimic buttons | Clement Ho | 2018-06-25 | 1 | -1/+1 |
* | | | | | | Resolve "Introduce hover, active, focus states for files in sidebar of Web IDE" | Paul Slaughter | 2018-06-25 | 3 | -20/+19 |
* | | | | | | Merge branch 'unify-some-projects-controllers' into 'master' | Robert Speicher | 2018-06-25 | 2 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Bring changes from EE | Lin Jen-Shin | 2018-06-26 | 2 | -1/+2 |
* | | | | | | | Merge branch '34371-vue-components-tech-debt' into 'master' | Mike Greiling | 2018-06-25 | 4 | -82/+88 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Moves list_dropdown and footer components to a .vue file34371-vue-components-tech-debt | Filipa Lacerda | 2018-06-22 | 4 | -82/+88 |
* | | | | | | | Merge branch 'fix-inconsistent-cancel-button' into 'master' | Clement Ho | 2018-06-25 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix localized button string | Andreas Kämmerle | 2018-06-25 | 1 | -1/+1 |
| * | | | | | | | Externalize button string | Andreas Kämmerle | 2018-06-25 | 1 | -1/+1 |
| * | | | | | | | Change button text to more specific Discard draftfix-inconsistent-cancel-button | Andreas Kämmerle | 2018-06-25 | 2 | -2/+2 |
* | | | | | | | | Merge remote-tracking branch 'dev/master' | Alessio Caiazza | 2018-06-25 | 3 | -3/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'security-html_escape_branch_name' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | HTML escape branch name in project graphs page | Imre Farkas | 2018-06-19 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'security-rd-do-not-show-internal-info-in-public-feed' into 'mas... | Alessio Caiazza | 2018-06-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Hide events from internal projects in public feed for anonymous users | Rubén Dávila | 2018-06-12 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'security-html_escape_usernames' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | HTML escape the name of the user in ProjectsHelper#link_to_member | Imre Farkas | 2018-06-15 | 1 | -1/+2 |
* | | | | | | | | | | | | Resolve "Guide users towards editing capabilities in review mode of Web IDE" | Paul Slaughter | 2018-06-25 | 1 | -2/+11 |
* | | | | | | | | | | | | Merge branch 'fl-fix-tech-debt' into 'master' | Mike Greiling | 2018-06-25 | 6 | -129/+131 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Use Pascal Case for Vue components importsfl-fix-tech-debt | Filipa Lacerda | 2018-06-25 | 1 | -8/+8 |
| * | | | | | | | | | | | | Merge branch 'master' into fl-fix-tech-debt | Filipa Lacerda | 2018-06-25 | 140 | -1096/+4654 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Moves tabs.js component into a vue file | Filipa Lacerda | 2018-06-21 | 4 | -94/+96 |
| * | | | | | | | | | | | | | Moves remove_issue component into a .vue file | Filipa Lacerda | 2018-06-21 | 2 | -19/+19 |
* | | | | | | | | | | | | | | Honor saml assurance level to allow 2FA bypassing | Roger Rüttimann | 2018-06-25 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master' | Douwe Maan | 2018-06-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Moves another RPC to mandatory | Zeger-Jan van de Weg | 2018-06-25 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'unify-admin-controllers' into 'master' | Douwe Maan | 2018-06-25 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Bring changes from EE | Lin Jen-Shin | 2018-06-25 | 2 | -4/+4 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Notify conflict only for opened/locked merge requests | Mark Chao | 2018-06-25 | 1 | -3/+5 |
* | | | | | | | | | | | | | | Merge branch 'kp-make-gfm-autocomplete-configurable' into 'master' | Phil Hughes | 2018-06-25 | 13 | -37/+63 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Update GFM autocomplete configkp-make-gfm-autocomplete-configurable | Kushal Pandya | 2018-06-25 | 7 | -7/+22 |