summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* :sparkles: use pre-existing components for title and descriptionide-merge-request-infoPhil Hughes2018-06-262-70/+70
* Added merge request info to Web IDE sidebarPhil Hughes2018-06-263-1/+122
* Merge branch 'unify-some-models' into 'master'Douwe Maan2018-06-262-1/+5
|\
| * Port Namespace#root_ancestor to CELin Jen-Shin2018-06-261-0/+4
| * Bring changes from EEunify-some-modelsLin Jen-Shin2018-06-261-1/+1
* | Merge branch 'patch-28' into 'master'Rémy Coutable2018-06-261-1/+1
|\ \
| * | Fix initial settings loading at the first run of GitLab installed from sourceAndrei Vukolov2018-06-251-1/+1
| * | Update wrong initial setting transfer in application_settings_controller.rbAndrei Vukolov2018-06-211-1/+1
* | | Merge branch 'dropdown-fix' into 'master'Phil Hughes2018-06-261-1/+1
|\ \ \
| * | | Fix for search dropdown scrollbar issue.İsmail Hakkı Ayaz2018-06-191-1/+1
* | | | Merge branch 'i18n-extract-app/views/shared-boards' into 'master'Rémy Coutable2018-06-265-21/+21
|\ \ \ \
| * | | | i18n: externalize strings from 'app/views/shared/boards'Tao Wang2018-06-165-21/+21
* | | | | Merge branch 'update_project_flash_error_message' into 'master'Rémy Coutable2018-06-261-1/+1
|\ \ \ \ \
| * | | | | Set flash error message only for current request when updating projectAram Visser2018-06-251-1/+1
* | | | | | Merge branch 'existing-gcp-accounts' into 'master'Mike Greiling2018-06-251-1/+1
|\ \ \ \ \ \
| * | | | | | Add back copy for existing gcp accounts within offer bannerexisting-gcp-accountstauriedavis2018-06-251-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '48339-sorting-by-name-on-explore-projects-page-renders-a-500-er...Robert Speicher2018-06-251-2/+2
|\ \ \ \ \ \
| * | | | | | Fix sorting by name on explore projects pageDouglas Barbosa Alexandre2018-06-251-2/+2
| |/ / / / /
* | | | | | Merge branch 'fix-alert-btn' into 'master'Mike Greiling2018-06-251-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Do not style alert links that mimic buttonsClement Ho2018-06-251-1/+1
* | | | | | Resolve "Introduce hover, active, focus states for files in sidebar of Web IDE"Paul Slaughter2018-06-253-20/+19
* | | | | | Merge branch 'unify-some-projects-controllers' into 'master'Robert Speicher2018-06-252-1/+2
|\ \ \ \ \ \
| * | | | | | Bring changes from EELin Jen-Shin2018-06-262-1/+2
* | | | | | | Merge branch '34371-vue-components-tech-debt' into 'master'Mike Greiling2018-06-254-82/+88
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Moves list_dropdown and footer components to a .vue file34371-vue-components-tech-debtFilipa Lacerda2018-06-224-82/+88
* | | | | | | Merge branch 'fix-inconsistent-cancel-button' into 'master'Clement Ho2018-06-252-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix localized button stringAndreas Kämmerle2018-06-251-1/+1
| * | | | | | | Externalize button stringAndreas Kämmerle2018-06-251-1/+1
| * | | | | | | Change button text to more specific Discard draftfix-inconsistent-cancel-buttonAndreas Kämmerle2018-06-252-2/+2
* | | | | | | | Merge remote-tracking branch 'dev/master'Alessio Caiazza2018-06-253-3/+4
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'security-html_escape_branch_name' into 'master'Alessio Caiazza2018-06-251-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | HTML escape branch name in project graphs pageImre Farkas2018-06-191-1/+1
| * | | | | | | | | Merge branch 'security-rd-do-not-show-internal-info-in-public-feed' into 'mas...Alessio Caiazza2018-06-251-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Hide events from internal projects in public feed for anonymous usersRubén Dávila2018-06-121-1/+1
| * | | | | | | | | | Merge branch 'security-html_escape_usernames' into 'master'Alessio Caiazza2018-06-251-1/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | HTML escape the name of the user in ProjectsHelper#link_to_memberImre Farkas2018-06-151-1/+2
* | | | | | | | | | | | Resolve "Guide users towards editing capabilities in review mode of Web IDE"Paul Slaughter2018-06-251-2/+11
* | | | | | | | | | | | Merge branch 'fl-fix-tech-debt' into 'master'Mike Greiling2018-06-256-129/+131
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use Pascal Case for Vue components importsfl-fix-tech-debtFilipa Lacerda2018-06-251-8/+8
| * | | | | | | | | | | | Merge branch 'master' into fl-fix-tech-debtFilipa Lacerda2018-06-25140-1096/+4654
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Moves tabs.js component into a vue fileFilipa Lacerda2018-06-214-94/+96
| * | | | | | | | | | | | | Moves remove_issue component into a .vue fileFilipa Lacerda2018-06-212-19/+19
* | | | | | | | | | | | | | Honor saml assurance level to allow 2FA bypassingRoger Rüttimann2018-06-251-1/+1
* | | | | | | | | | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master'Douwe Maan2018-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Moves another RPC to mandatoryZeger-Jan van de Weg2018-06-251-1/+1
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'unify-admin-controllers' into 'master'Douwe Maan2018-06-252-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Bring changes from EELin Jen-Shin2018-06-252-4/+4
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Notify conflict only for opened/locked merge requestsMark Chao2018-06-251-3/+5
* | | | | | | | | | | | | | Merge branch 'kp-make-gfm-autocomplete-configurable' into 'master'Phil Hughes2018-06-2513-37/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Update GFM autocomplete configkp-make-gfm-autocomplete-configurableKushal Pandya2018-06-257-7/+22