summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Fix typo in docs about ElasticsearchTakuya Noguchi2019-06-285-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | Merge branch 'docs/refactor-2fa' into 'master'Evan Read2019-07-015-68/+82
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the 2FA docs See merge request gitlab-org/gitlab-ce!30087
| * | | | | | | | | | Refactor the 2FA docsdocs/refactor-2faAchilleas Pipinellis2019-06-285-68/+82
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove outdated images - Add info on browser support - Mention that U2F works with SoloKeys
* | | | | | | | | | Merge branch 'docs/health_check' into 'master'Evan Read2019-07-011-21/+30
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62080 Closes #62080 See merge request gitlab-org/gitlab-ce!30148
| * | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62080Russell Dickenson2019-07-011-21/+30
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '63913-quarantine-schema-check' into 'master'Thong Kuah2019-07-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine schema_version_check because tests after it failed See merge request gitlab-org/gitlab-ce!30198
| * | | | | | | | | | Quarantine schema_version_check because tests after it failedLin Jen-Shin2019-07-011-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '63463-follow-up-from-insights-is-now-ga-docs' into 'master'Achilleas Pipinellis2019-06-293-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a link in the docs to the epic that defined the Insights feature Closes #63463 See merge request gitlab-org/gitlab-ce!30181
| * | | | | | | | | | Add a link in the docs to the epic that defined the Insights feature63463-follow-up-from-insights-is-now-ga-docsRémy Coutable2019-06-283-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'rs-config-settings' into 'master'Lin Jen-Shin2019-06-291-8/+136
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy Settings initializer from EE See merge request gitlab-org/gitlab-ce!30140
| * | | | | | | | | | | Move mirror settings to their own EE blockrs-config-settingsRobert Speicher2019-06-281-3/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Copy Settings initializer from EERobert Speicher2019-06-271-8/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings parity between the two versions.
* | | | | | | | | | | | Merge branch 'check-min-schema-migrate' into 'master'Robert Speicher2019-06-286-1/+99
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure we are on a supported version before migrating See merge request gitlab-org/gitlab-ce!29882
| * | | | | | | | | | | Fix extra newline left by conflict resolutioncheck-min-schema-migrateDJ Mountney2019-06-281-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into 'check-min-schema-migrate'DJ Mountney2019-06-28506-2936/+7520
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | # Conflicts: # lib/gitlab/database.rb
| * | | | | | | | | | | Update comments and docs around min schema versionDJ Mountney2019-06-253-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some spelling Dropped rake task description for a prefix only task Added note on skipping the check to the postgres debugging dev doc
| * | | | | | | | | | | Add the frozen literal to the correct fileDJ Mountney2019-06-252-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Drop the source upgrade changeDJ Mountney2019-06-253-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer need to point people away from using db:migrate
| * | | | | | | | | | | Add an flag for skipping the schema version checkDJ Mountney2019-06-255-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you chose to use the rollback migration feature on your current version for example, you should still have a way to migrate, being that you are still on a supported migration path.
| * | | | | | | | | | | Fix db:migrate for fresh installsDJ Mountney2019-06-251-1/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Move min schema version check to db:migrateDJ Mountney2019-06-256-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than have it checked only as part of gitlab:db:configure, we will instead have it as a pre-req for every db:migrate command
| * | | | | | | | | | | Check supported version when migratingDJ Mountney2019-06-255-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the mininum supported migration version to be the schema version as of 11.11.0, and errors you if that is not detected during gitlab:db:configure
* | | | | | | | | | | | Merge branch 'mh/collapsible-boards' into 'master'Mike Greiling2019-06-288-84/+168
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow collapsing all issue boards Closes #40630 See merge request gitlab-org/gitlab-ce!29955
| * | | | | | | | | | | | Allow collapsing all issue boardsMartin Hanzel2019-06-288-84/+168
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All issue boards can now be collapsed via a button, re-ordered by dragging the header, and the vertical collapsed header style was reworked.
* | | | | | | | | | | | Merge branch '63874-use-process-cpu-time-instead-of-thread-for-cpu-metrics' ↵Stan Hu2019-06-282-13/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Use PROCESS_CPUTIME_ID for cpu time metrics Closes #63874 See merge request gitlab-org/gitlab-ce!30166
| * | | | | | | | | | | | Fix spec definitions63874-use-process-cpu-time-instead-of-thread-for-cpu-metricsAleksei Lipniagov2019-06-281-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use PROCESS_CPUTIME_ID for cpu time metricsAleksei Lipniagov2019-06-281-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To measure ruby cpu time, we should use PROCESS_CPUTIME_ID instead of THREAD_CPUTIME_ID in our environments.
* | | | | | | | | | | | | Merge branch 'vue-i18n-js-boards-directory' into 'master'Mike Greiling2019-06-2811-57/+138
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for 'app/assetsjavascripts/boards' dir See merge request gitlab-org/gitlab-ce!29877
| * | | | | | | | | | | | | Vue-i18n: javascripts/boards directoryEzekiel Kigbo2019-06-2811-57/+138
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/javascripts/boards directory
* | | | | | | | | | | | | Merge branch 'leipert-absolute-scss-paths' into 'master'Mike Greiling2019-06-2811-186/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use absolute paths for SCSS imports See merge request gitlab-org/gitlab-ce!30161
| * | | | | | | | | | | | Fix modal related testsPaul Gascou-Vaillancourt2019-06-282-25/+12
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix selector in karma specLukas Eipert2019-06-281-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Set logModifiedComponents in jest and karmaPaul Slaughter2019-06-282-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - stub MutationObserver in Jest
| * | | | | | | | | | | | Use absolute paths for SCSS importsLukas Eipert2019-06-286-160/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent update in [GitLab UI] and setting the [config.assets.paths] to include `node_modules` for the resolution of SCSS imports, allows us to have much nicer imports which don't rely on brittle relative paths. This change also forwards @gitlab/ui to the newest version [GitLab UI]: https://gitlab.com/gitlab-org/gitlab-ui/merge_requests/602 [config.assets.paths]: https://gitlab.com/gitlab-org/gitlab-ce/blob/d9026d0ffa0/config/application.rb#L169
* | | | | | | | | | | | | Merge branch 'revert-423c4c43' into 'master'62722-boot-app-in-ci-and-check-memory-v2Rémy Coutable2019-06-284-40/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'" Closes gitlab-ee#12491 See merge request gitlab-org/gitlab-ce!30182
| * | | | | | | | | | | | Revert "Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'"Rémy Coutable2019-06-284-40/+5
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !30031
* | | | | | | | | | | | Merge branch '10087-settings-pannel' into 'master'63463-follow-up-from-insights-is-now-ga62296-conform-on-single-icon-for-dropdown-buttons-which-align-with-design-systemPhil Hughes2019-06-282-27/+55
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves EE differences for app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue Closes gitlab-ee#10087 See merge request gitlab-org/gitlab-ce!30127
| * | | | | | | | | | | | Moves EE code into a mixin10087-settings-pannelFilipa Lacerda2019-06-282-27/+55
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'last-commit-widget-api-call' into 'master'Filipa Lacerda2019-06-289-100/+120
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GraphQL API to fetch last commit data See merge request gitlab-org/gitlab-ce!29934
| * | | | | | | | | | | | | Use GraphQL API to fetch last commit data for treePhil Hughes2019-06-289-100/+120
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'transaction-metrics' into 'master'Lin Jen-Shin2019-06-284-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Monitor database transaction activity for Rails See merge request gitlab-org/gitlab-ce!29928
| * | | | | | | | | | | | | | Adds metrics to measure database transactionstransaction-metricsAndrew Newdigate2019-06-284-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we don't have good insight into the affect of Rails transaction blocks on the application. If these blocks are held open for extended periods, they can have detrimental effects on the application. This change will allow us to track these transactions, with the aim of reducing their duration.
* | | | | | | | | | | | | | | Merge branch 'qa-staging-59-fix-project-template-spec-ce' into 'master'Lin Jen-Shin2019-06-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of "Fix project template spec" See merge request gitlab-org/gitlab-ce!30152
| * | | | | | | | | | | | | | Use 'has_css?' because 'first' does not return booleanqa-staging-59-fix-project-template-spec-ceSanad Liaquat2019-06-281-1/+1
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'docs-update-subject-label-issue-workflow' into 'master'Rémy Coutable2019-06-281-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update issue workflow for subject labels See merge request gitlab-org/gitlab-ce!30164
| * | | | | | | | | | | | | | Update issue workflow for subject labelsdocs-update-subject-label-issue-workflowMark Fletcher2019-06-281-0/+5
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mentions the automatic inference of stage and group labels based on the applied subject labels
* | | | | | | | | | | | | | Merge branch 'update-prometheus-client-mmap' into 'master'Stan Hu2019-06-282-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update prometheus-client-mmap to 0.9.6 Closes #63872 See merge request gitlab-org/gitlab-ce!30165
| * | | | | | | | | | | | | | Update prometheus-client-mmap to 0.9.6update-prometheus-client-mmapKamil Trzciński2019-06-282-3/+3
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'small-s-in-elasticsearch-in-code' into 'master'Rémy Coutable2019-06-283-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in code comments about Elasticsearch See merge request gitlab-org/gitlab-ce!30163
| * | | | | | | | | | | | | | Fix typo in code comments about ElasticsearchTakuya Noguchi2019-06-283-2/+7
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>