summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'qa-nightly-68-quarantine-devops-tests' into 'master'Ramya Authappan2019-01-301-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine auto devops QA tests See merge request gitlab-org/gitlab-ce!24786
| * | | | | | | | | | | | | Quarantine devops testsSanad Liaquat2019-01-301-1/+2
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'patch-28' into 'master'Evan Read2019-01-301-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing parameter cluster_id in the params list for edit project cluster endpoint See merge request gitlab-org/gitlab-ce!24731
| * | | | | | | | | | | | Added missing parameter cluster_id in the params list for edit project ↵akkee2019-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cluster endpoint
* | | | | | | | | | | | | Merge branch 'docs-repositories-api-fix' into 'master'Evan Read2019-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Minor fix to formatting See merge request gitlab-org/gitlab-ce!24696
| * | | | | | | | | | | | | Docs: Minor fix to formattingMarti Raudsepp2019-01-261-1/+1
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'staging-26-delete_all_subgroups_task' into 'master'Dan Davison2019-01-294-1/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add script to remove all subgroups within a provided group See merge request gitlab-org/gitlab-ce!24593
| * | | | | | | | | | | | | Add script to delete all subgroups within the specified groupSanad Liaquat2019-01-244-1/+91
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'revert-add-whats-new' into 'master'Dmitriy Zaporozhets2019-01-2911-293/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the "What's new" feature See merge request gitlab-org/gitlab-ce!24772
| * | | | | | | | | | | | | | Revert the "What's new" featureBrandon Labuschagne2019-01-2911-293/+8
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '55820-adds-common-name-chart-value' into 'master'Stan Hu2019-01-292-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overrides commonName Helm chart value Closes #55820 See merge request gitlab-org/gitlab-ce!24683
| * | | | | | | | | | | | | Common name needs to be lower caseJoão Cunha2019-01-282-2/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Overrides commonName Helm chart attr with default valueJoão Cunha2019-01-251-2/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ee-6526-port-ee-changes' into 'master'Douglas Barbosa Alexandre2019-01-291-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port EE style for lib/gitlab/metrics/influx_db.rb Closes gitlab-ee#6526 See merge request gitlab-org/gitlab-ce!24773
| * | | | | | | | | | | | | Port this style change from EELin Jen-Shin2019-01-301-3/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ab-54270-github-iid' into 'master'Yorick Peterse2019-01-2914-83/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce amount of locks needed for GitHub importer Closes #54270 and #51817 See merge request gitlab-org/gitlab-ce!24102
| * | | | | | | | | | | | | Add changelog for performanceAndreas Brandl2019-01-291-0/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Flush InternalId records after importAndreas Brandl2019-01-294-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the import has finished, we flush (delete) the InternalId records related to the project at hand. This means we're starting over with tracking correct internal id values, a new record will be created automatically when the next internal id is generated. The GitHub importer assigns iid values by using supplied values from GitHub. We skip tracking internal id values during the import in favor of higher concurrency. Deleting any InternalId records after the import has finished is an extra measure to guarantee consistency. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54270.
| * | | | | | | | | | | | | Add migration to cleanup iid recordsAndreas Brandl2019-01-291-0/+43
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Revert " Trigger iid logic from GitHub importer for merge requests."Andreas Brandl2019-01-292-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fb98496f49bbb324b808523ea97f0844682fe1ac.
| * | | | | | | | | | | | | Revert "Trigger iid logic from GitHub importer for issues."Andreas Brandl2019-01-292-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b78a69b06c165f7a463d5e0de69030346d9d5c72.
| * | | | | | | | | | | | | Revert "Trigger iid logic from GitHub importer for milestones."Andreas Brandl2019-01-295-42/+6
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 358675d09f6ba0fdcc4a089c6d1da6df9ff6d092.
* | | | | | | | | | | | | Merge branch 'add_gitlab_pages_predefined_variables' into 'master'Douglas Barbosa Alexandre2019-01-294-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab Pages predefined variables See merge request gitlab-org/gitlab-ce!24504
| * | | | | | | | | | | | | Add GitLab Pages predefined variablesAdrian Moisey2019-01-294-0/+23
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'btn-group-secure-group-dashboard' into 'master'Clement Ho2019-01-291-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport button style changes to CE See merge request gitlab-org/gitlab-ce!24609
| * | | | | | | | | | | | | Backport button style changes to CEFernando Arias2019-01-291-0/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'tnir/prometheus-metrics-docs' into 'master'Marcia Ramos2019-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo: Prometheus Metrics See merge request gitlab-org/gitlab-ce!24344
| * | | | | | | | | | | | | Fix typo: Prometheus MetricsTakuya Noguchi2019-01-291-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | | | Merge branch 'remove-duplicated-show-forms-on-cluster-views' into 'master'Grzegorz Bizon2019-01-295-94/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes duplicated cluster show partials See merge request gitlab-org/gitlab-ce!24654
| * | | | | | | | | | | | | Removes duplicated cluster show partialsMayra Cabrera2019-01-285-94/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gcp/show and user/show partial contain basically the same html elements causing duplication. The difference between the partials is that one of them has html elements disabled if the cluster is managed. This MR aims to remove that duplication by having just a single show partial for both types
* | | | | | | | | | | | | | Merge branch 'qa-ml-quarantine-diff-patch-spec' into 'master'Mark Lapierre2019-01-291-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine diff patch spec See merge request gitlab-org/gitlab-ce!24769
| * | | | | | | | | | | | | Quarantine failing testMark Lapierre2019-01-291-1/+4
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See: https://gitlab.com/gitlab-org/quality/nightly/issues/42 Also failing in staging until the fix is picked into the next release: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24533
* | | | | | | | | | | | | Merge branch 'gt-externalize-app-views-projects-milestones' into 'master'ee-1979-2-controllerKushal Pandya2019-01-297-37/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/projects/milestones` See merge request gitlab-org/gitlab-ce!24726
| * | | | | | | | | | | | Externalize strings from `/app/views/projects/milestones`George Tsiolis2019-01-297-37/+75
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Kushal Pandya2019-01-292-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.48.0 See merge request gitlab-org/gitlab-ce!24744
| * | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.48.0Lukas 'Eipi' Eipert2019-01-292-5/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '50352-sort-save' into 'master'Sean McGivern2019-01-2917-45/+151
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save sorting preference for Issues/MRs in BE Closes #50352 See merge request gitlab-org/gitlab-ce!24198
| * | | | | | | | | | | | | Save sorting preference for Issues/MRs in BEMario de la Ossa2019-01-2817-45/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to let users' sorting preferences transfer between devices, we save the preference for issues and MRs (one preference for issues, one for MRs) in the backend inside the UserPreference object
* | | | | | | | | | | | | | Merge branch 'gt-externalize-app-views-clusters' into 'master'Filipa Lacerda2019-01-296-11/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/clusters` See merge request gitlab-org/gitlab-ce!24666
| * | | | | | | | | | | | | | Externalize strings from `/app/views/clusters`George Tsiolis2019-01-296-11/+22
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'docs-localized-dates-in-ruby' into 'master'Marcia Ramos2019-01-291-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how to format localized dates in Ruby Closes #41237 See merge request gitlab-org/gitlab-ce!24585
| * | | | | | | | | | | | | Document how to format localized dates in RubyMayra Cabrera2019-01-281-0/+10
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This documents the two ways we currently localized dates: 1) Using l helper 2) Through strftime Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/41237
* | | | | | | | | | | | | Merge branch 'gitlab-kitchen-analogy-docs' into 'master'Mike Lewis2019-01-291-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitLab as kitchen analogy See merge request gitlab-org/gitlab-ce!24742
| * | | | | | | | | | | | | Update kitchen metaphor per Suri commentMike Lewis2019-01-291-3/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Small edit to kitchen analogyMike Lewis2019-01-281-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Update kitchen analogy textMike Lewis2019-01-281-3/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add GitLab as kitchen analogyMike Lewis2019-01-281-0/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs-56814-ci-variable-url-clarify' into 'master'Evan Read2019-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that project URL could be HTTP or HTTPS Closes #56814 See merge request gitlab-org/gitlab-ce!24667
| * | | | | | | | | | | | | Clarify that project URL could be HTTP or HTTPSMark Fletcher2019-01-251-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'qa-ml-fix-rebase-spec' into 'master'Ramya Authappan2019-01-282-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reload if needed when checking merge status Closes gitlab-org/quality/nightly#64 See merge request gitlab-org/gitlab-ce!24732