summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [QA] Add a new scenario to test GitHub importrc-qa-146Rémy Coutable2018-06-2613-5/+275
* [QA] Add a new Page::Issuable::Show pageRémy Coutable2018-06-262-0/+22
* Merge branch '46783-removed-omniauth-provider-causing-invalid-application-set...Stan Hu2018-06-264-17/+60
|\
| * Ignore unknown OAuth sources in ApplicationSetting46783-removed-omniauth-provider-causing-invalid-application-settingRémy Coutable2018-06-264-17/+60
* | 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'Tao Wang2018-06-143-7/+7
* | | Merge branch 'update-pipeline-icon-in-web-ide-sidebar' into 'master'Tim Zallmann2018-06-262-1/+6
|\ \ \
| * | | 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'Tao Wang2018-06-165-17/+17
* | | | | Merge branch 'rails5-fix-mysql-arel-from' into 'master'Yorick Peterse2018-06-262-1/+12
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 'add-proofreader' into 'master'Rémy Coutable2018-06-261-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 projectAram Visser2018-06-252-2/+2
* | | | | | | | | | | Merge branch 'docs-contributing-links' into 'master'Achilleas Pipinellis2018-06-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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 bannerexisting-gcp-accountstauriedavis2018-06-252-1/+6
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '48339-sorting-by-name-on-explore-projects-page-renders-a-500-er...Robert Speicher2018-06-253-6/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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/changelogJacob Vosmaer (GitLab)2018-06-252-19/+41
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fix-alert-btn' into 'master'Mike Greiling2018-06-252-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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 tooZeger-Jan van de Weg2018-06-251-1/+1
* | | | | | | | | | | | | | Merge branch '33886-resolve-fsevents-issues' into 'master'Clement Ho2018-06-254-133/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | 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"Paul Slaughter2018-06-254-20/+24
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'unify-some-projects-controllers' into 'master'Robert Speicher2018-06-252-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bring changes from EELin Jen-Shin2018-06-262-1/+2
| |/ / / / / / / / / / / /