summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Use the branch instead of the tag to installAchilleas Pipinellis2018-06-262-7/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch ↵Stan Hu2018-06-264-17/+60
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46783-removed-omniauth-provider-causing-invalid-application-setting' into 'master' Resolve "Removed omniauth provider causing invalid application setting" Closes #46783 See merge request gitlab-org/gitlab-ce!20129
| * | | | | | | | | | | Ignore unknown OAuth sources in ApplicationSetting46783-removed-omniauth-provider-causing-invalid-application-settingRémy Coutable2018-06-264-17/+60
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'i18n-extract-app/views/projects-deployments' into 'master'Rémy Coutable2018-06-263-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n: externalize strings from 'app/views/projects/deployments' See merge request gitlab-org/gitlab-ce!19848
| * | | | | | | | | | | i18n: externalize strings from 'app/views/projects/deployments'Tao Wang2018-06-143-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | | | | | | | | | | Merge branch 'update-pipeline-icon-in-web-ide-sidebar' into 'master'Tim Zallmann2018-06-262-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pipeline icon in web ide sidebar Closes #48206 See merge request gitlab-org/gitlab-ce!20058
| * | | | | | | | | | | | Update pipeline icon in web ide sidebarGeorge Tsiolis2018-06-212-1/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'i18n-extract-app/views/admin-labels' into 'master'Rémy Coutable2018-06-265-17/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n: externalize strings from 'app/views/admin/labels' See merge request gitlab-org/gitlab-ce!19926
| * | | | | | | | | | | | | i18n: externalize strings from 'app/views/admin/labels'Tao Wang2018-06-165-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | | | | | | | | | | | | Merge branch 'rails5-fix-mysql-arel-from' into 'master'Yorick Peterse2018-06-262-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix arel from in mysql_median_datetime_sql See merge request gitlab-org/gitlab-ce!20167
| * | | | | | | | | | | | | | Rails5 fix arel from in mysql_median_datetime_sqlJasper Maes2018-06-262-1/+12
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'issue_47729' into 'master'Sean McGivern2018-06-266-4/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix refresh cache for open issues count service Closes #47945 See merge request gitlab-org/gitlab-ce!19904
| * | | | | | | | | | | | | | BatchOpenIssuesCount only updates public issues countissue_47729Felipe Artur2018-06-253-16/+19
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix refresh cache for open issues count serviceFelipe Artur2018-06-217-7/+134
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'unify-some-models' into 'master'Douwe Maan2018-06-263-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-262-0/+17
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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 'add-proofreader' into 'master'Rémy Coutable2018-06-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Hiroyuki Sato as a Japanese proofreader See merge request gitlab-org/gitlab-ce!20134
| * | | | | | | | | | | | | | | | | Add Hiroyuki Sato as a Japanese proofreaderHiroyuki Sato2018-06-251-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'update_project_flash_error_message' into 'master'Rémy Coutable2018-06-262-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-2/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'docs-contributing-links' into 'master'Achilleas Pipinellis2018-06-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CONTRIBUTING.md to fix links See merge request gitlab-org/gitlab-ce!19814
| * | | | | | | | | | | | | | | | | Update CONTRIBUTING.md to fix linksMarcel Amirault2018-06-141-2/+2
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'existing-gcp-accounts' into 'master'Mike Greiling2018-06-252-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-1/+6
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch ↵Robert Speicher2018-06-253-6/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | | | | | | | | | | | | | Add CHANGELOGDouglas Barbosa Alexandre2018-06-251-0/+5
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix sorting by name on explore projects pageDouglas Barbosa Alexandre2018-06-252-6/+16
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'changelog-code-style' into 'master'Robert Speicher2018-06-252-19/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve shelling out in bin/changelog See merge request gitlab-org/gitlab-ce!18977
| * | | | | | | | | | | | | | | | | | Improve shelling out in bin/changelogJacob Vosmaer (GitLab)2018-06-252-19/+41
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'fix-alert-btn' into 'master'Mike Greiling2018-06-252-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-1/+6
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'zj-exclude-geo-database-yaml' into 'master'Robert Speicher2018-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude Geo DB Yaml on CE too See merge request gitlab-org/gitlab-ce!20143
| * | | | | | | | | | | | | | | | | | | Exclude Geo DB Yaml on CE tooZeger-Jan van de Weg2018-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Geo, a file is created for configuration of the database. This file shouldn't appear in CE, but if you've setup your GDK with a remote pointing to CE and one to EE, this file might be around when switching branches. This will mark the workspace dirty, which annoys me more than it should. [ci skip]
* | | | | | | | | | | | | | | | | | | | Merge branch '33886-resolve-fsevents-issues' into 'master'Clement Ho2018-06-254-133/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "100% CPU for webpack-dev-server running in GDK" Closes #33886 See merge request gitlab-org/gitlab-ce!20113
| * | | | | | | | | | | | | | | | | | | Resolve "100% CPU for webpack-dev-server running in GDK"Mike Greiling2018-06-254-133/+122
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'unify-api-boards_spec.rb' into 'master'Robert Speicher2018-06-251-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify spec/requests/api/boards_spec.rb See merge request gitlab-org/gitlab-ce!20158
| * | | | | | | | | | | | | | | | | | Bring changes from EELin Jen-Shin2018-06-261-1/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '46202-webide-file-states' into 'master'Mike Greiling2018-06-254-20/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Introduce hover, active, focus states for files in sidebar of Web IDE" Closes #46202 See merge request gitlab-org/gitlab-ce!19969
| * | | | | | | | | | | | | | | | | | Resolve "Introduce hover, active, focus states for files in sidebar of Web IDE"Paul Slaughter2018-06-254-20/+24
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | 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