summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)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
| | | | Closes #45187
* Merge branch 'unify-some-models' into 'master'Douwe Maan2018-06-262-1/+5
|\ | | | | | | | | CE: Move some EE only codes in models to their EE modules See merge request gitlab-org/gitlab-ce!20160
| * 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
|\ \ | | | | | | | | | | | | Update wrong initial setting transfer in application_settings_controller.rb See merge request gitlab-org/gitlab-ce!20059
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | Css fix for search dropdown overflow issue. See merge request gitlab-org/gitlab-ce!20011
| * | | 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' See merge request gitlab-org/gitlab-ce!19934
| * | | | i18n: externalize strings from 'app/views/shared/boards'Tao Wang2018-06-165-21/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | | | 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 project Closes #43772 See merge request gitlab-org/gitlab-ce!20126
| * | | | | 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 banner See merge request gitlab-org/gitlab-ce!20159
| * | | | | | Add back copy for existing gcp accounts within offer bannerexisting-gcp-accountstauriedavis2018-06-251-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch ↵Robert Speicher2018-06-251-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '48339-sorting-by-name-on-explore-projects-page-renders-a-500-error-when-logged-in' into 'master' Resolve "Sorting by name on explore projects page renders a 500 error when logged in" Closes #48339 See merge request gitlab-org/gitlab-ce!20162
| * | | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alert button styling so that they don't show up white Closes #48407 See merge request gitlab-org/gitlab-ce!20163
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify some projects controllers See merge request gitlab-org/gitlab-ce!20157
| * | | | | | 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 some issue boards components into `.vue` file See merge request gitlab-org/gitlab-ce!20106
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change button text to more specific "Discard draft" Closes #47475 See merge request gitlab-org/gitlab-ce!20140
| * | | | | | | 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
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] HTML escape branch name in project graphs page See merge request gitlab/gitlabhq!2408
| | * | | | | | | | 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 ↵Alessio Caiazza2018-06-251-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [master] Don't show internal info in public feed See merge request gitlab/gitlabhq!2395
| | * | | | | | | | | Hide events from internal projects in public feed for anonymous usersRubén Dávila2018-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a bug where an anonymous user was able to see the activity related to internal projects when visiting the public profile of a user of the GitLab instance.
| * | | | | | | | | | Merge branch 'security-html_escape_usernames' into 'master'Alessio Caiazza2018-06-251-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_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
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves remove_issue component into a .vue file See merge request gitlab-org/gitlab-ce!20067
| * | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (67 commits) (Part 1) Resolve "Recognise when a user is trying to validate a private SSH key" Fix auto_cancel_pending_pipelines check Resolve "2FA should not attempt to use U2F in unsupported browsers" Resolve "Change the BitBucket import page to indicate that its for BB Cloud only, not for on-prem BB" Resolve "Help users find our contributing page" Docs broken links Refactor issue boards and get the EE changes to CE Adds test to cover the fix in #45575 Log push output on exception Update gitlab_chart.md Remove top margin for bootstrap popover headers Bump sprockets to 3.7.2 to address CVE-2018-3760 Bring changes from EE Bring changes from EE Simplify the decode secret step Cleanup ruby sampler metrics Raw diffs are served from Gitaly add inline badges to auto devops feature list Add more large tables to cop Bring changes from EE ...
| * | | | | | | | | | | | | 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 CreateFromBundle RPC to mandatory Closes gitaly#944 See merge request gitlab-org/gitlab-ce!20144
| * | | | | | | | | | | | | | Moves another RPC to mandatoryZeger-Jan van de Weg2018-06-251-1/+1
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This specific one isn't used on most machines, therefor low risk. Closes https://gitlab.com/gitlab-org/gitaly/issues/944
* | | | | | | | | | | | | | Merge branch 'unify-admin-controllers' into 'master'Douwe Maan2018-06-252-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify some admin controllers See merge request gitlab-org/gitlab-ce!20147
| * | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make GFM Autocomplete configurable See merge request gitlab-org/gitlab-ce!20066
| * | | | | | | | | | | | | | Update GFM autocomplete configkp-make-gfm-autocomplete-configurableKushal Pandya2018-06-257-7/+22
| | | | | | | | | | | | | | |