summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge branch 'winh-make-it-right-now' into 'master'Annabel Gray2018-05-222-19/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "right now" for short time periods Closes #40563 See merge request gitlab-org/gitlab-ce!19095
| * | | | | | | | | | | | | | | | Use "right now" for short time periodsWinnie Hellmann2018-05-222-19/+85
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'dm-xcode-project-directory' into 'master'Robert Speicher2018-05-223-13/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Xcode project detection by looking for dirs instead of files See merge request gitlab-org/gitlab-ce!19035
| * | | | | | | | | | | | | | | | Fix Xcode project detection by looking for dirs instead of filesdm-xcode-project-directoryDouwe Maan2018-05-223-13/+23
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'fix/unverified-hover-state' into 'master'Annabel Gray2018-05-222-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unverified hover state color changed to almost-black See merge request gitlab-org/gitlab-ce!19031
| * | | | | | | | | | | | | | | | | unverified hover state color changed to almost-blackMurat Dogan2018-05-222-0/+9
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'workhorse-4.2.1' into 'master'Alessio Caiazza2018-05-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade workhorse to v4.2.1 See merge request gitlab-org/gitlab-ce!19087
| * | | | | | | | | | | | | | | | | Upgrade workhorse to v4.2.1Alessio Caiazza2018-05-221-1/+1
| | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'dz-no-ee-check' into 'master'Rémy Coutable2018-05-222-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add check for top-level ee directory in CE repo Closes #46239 See merge request gitlab-org/gitlab-ce!19062
| * | | | | | | | | | | | | | | | Update no-ee-check with rubocop recommendation.Dmitriy Zaporozhets2018-05-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | | | | Add check for top-level ee directory in CE repoDmitriy Zaporozhets2018-05-212-0/+20
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | Merge branch ↵Douwe Maan2018-05-224-41/+107
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | / / / / / / / | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master' Resolve "notifications broken during email address change before email confirmed" Closes #22846 See merge request gitlab-org/gitlab-ce!18474
| * | | | | | | | | | | | | | Don't set the notification_email when only unconfirmed_email is changed22846-notifications-broken-during-email-address-change-before-email-confirmedRémy Coutable2018-05-224-41/+107
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | Merge branch 'ab-46530-mediumtext-for-gpg-keys' into 'master'Yorick Peterse2018-05-225-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase text limit for GPG keys (mysql only). Closes #46530 See merge request gitlab-org/gitlab-ce!19069
| * | | | | | | | | | | | | Increase text limit for GPG keys (mysql only).ab-46530-mediumtext-for-gpg-keysAndreas Brandl2018-05-225-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #46530.
* | | | | | | | | | | | | | Merge branch 'sh-bump-prometheus-client-mmap' into 'master'Nick Thomas2018-05-223-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump prometheus-client-mmap to 0.9.3 to fix nil exception error See merge request gitlab-org/gitlab-ce!19085
| * | | | | | | | | | | | | Bump prometheus-client-mmap to 0.9.3 to fix nil exception errorsh-bump-prometheus-client-mmapStan Hu2018-05-223-3/+8
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/prometheus-client-mmap/issues/24
* | | | | | | | | | | | | Merge branch 'ce-6114-move-some-features-projects-specs' into 'master'Rémy Coutable2018-05-221-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Resolve "Extract EE specific files/lines for some projects features specs" See merge request gitlab-org/gitlab-ce!19084
| * | | | | | | | | | | | | Unify spec/features/projects/blobs/blob_show_spec.rbLin Jen-Shin2018-05-221-0/+18
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ab-42194-keyset-pagination' into 'master'Yorick Peterse2018-05-223-50/+417
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Keyset pagination support Closes #45756 See merge request gitlab-org/gitlab-ce!18584
| * | | | | | | | | | | | | Add feature-flag for keyset pagination.ab-42194-keyset-paginationAndreas Brandl2018-05-211-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add keyset pagination for API calls.Andreas Brandl2018-05-212-13/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #45756.
| * | | | | | | | | | | | | Refactor and extract DefaultPaginationStrategy.Andreas Brandl2018-05-212-45/+56
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ab-43706-composite-primary-keys' into 'master'Yorick Peterse2018-05-226-5/+126
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migration to add primary key constraint for composite keys Closes #43706 and #32258 See merge request gitlab-org/gitlab-ce!18980
| * | | | | | | | | | | | | | Migration to add/drop primary key constraints for composite keys.ab-43706-composite-primary-keysAndreas Brandl2018-05-212-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #43706.
| * | | | | | | | | | | | | | Add NOT NULL constraints to project_authorizations.Andreas Brandl2018-05-214-5/+48
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #32258.
* | | | | | | | | | | | | | Merge branch '45827-expose_readme_url_in_project_api' into 'master'Rémy Coutable2018-05-229-6/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose readme url in Project API Closes #45827 See merge request gitlab-org/gitlab-ce!18960
| * | | | | | | | | | | | | Expose readme url in Project APIImre Farkas2018-05-229-6/+57
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rename-merge-request-widget-author-component' into 'master'Phil Hughes2018-05-225-8/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename merge request widget author component See merge request gitlab-org/gitlab-ce!19079
| * | | | | | | | | | | | | Rename merge request widget author componentGeorge Tsiolis2018-05-225-8/+13
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fj-46411-fix-badge-api-endpoint-route-with-relative-url' into ↵Douwe Maan2018-05-223-4/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fixed badge api endpoint route when relative_url is set Closes #46411 See merge request gitlab-org/gitlab-ce!19004
| * | | | | | | | | | | | | | Fixed badge api endpoint route when relative_url is setfj-46411-fix-badge-api-endpoint-route-with-relative-urlFrancisco Javier López2018-05-173-4/+9
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jira-clarify-docs' into 'master'Achilleas Pipinellis2018-05-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarifying Jira documentaiton See merge request gitlab-org/gitlab-ce!19046
| * | | | | | | | | | | | | | | Clarifying Jira documentaitonAric Buerer2018-05-221-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'fj-46459-fix-expose-url-when-base-url-set' into 'master'Douwe Maan2018-05-223-4/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `expose_url` helper does not include custom base url if it is set Closes #46459 See merge request gitlab-org/gitlab-ce!19003
| * | | | | | | | | | | | | | | Fix `expose_url` helper does not include custom base url if it is setFrancisco Javier López2018-05-223-4/+26
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '45532-upgrade-vue-loader' into 'master'Phil Hughes2018-05-223-190/+153
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Upgrade vue-loader for bug fixes and a simpler webpack config" Closes #45532 See merge request gitlab-org/gitlab-ce!19052
| * | | | | | | | | | | | | | simplify and reorganize webpack config45532-upgrade-vue-loaderMike Greiling2018-05-181-98/+88
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | move devtool setting into main config objectMike Greiling2018-05-181-3/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | upgrade to vue-loader 15.0.11 and update webpack configMike Greiling2018-05-183-92/+66
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Update VERSION to 11.0.0-prev11.0.0.prece41861/devops-remove-betaMayra Cabrera2018-05-211-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'collapsed-contextual-nav-update' into 'master'Tim Zallmann2018-05-214-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed 'Overview' to 'Project' in collapsed contextual navigation at a project level See merge request gitlab-org/gitlab-ce!18996
| * | | | | | | | | | | | | | | Renamed 'Overview' to 'Project' in collapsed contextual navigation at a ↵Constance Okoghenun2018-05-214-4/+10
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project level
* | | | | | | | | | | | | | | Update VERSION to 10.9.0-prev10.9.0.preMayra Cabrera2018-05-211-1/+1
| |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Update CHANGELOG.md for 10.8.0Mayra Cabrera2018-05-21156-786/+176
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | Merge branch 'ce-5928-geo-rake-task-to-force-housekeeping-on-next-sync' into ↵Nick Thomas2018-05-213-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Backport from EE: Adding Progressbar explicitly and spec extensions for it See merge request gitlab-org/gitlab-ce!18885
| * | | | | | | | | | | | | Adding progressbar explicitly and spec extensions for itce-5928-geo-rake-task-to-force-housekeeping-on-next-syncGabriel Mazetto2018-05-103-0/+8
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '45746-fix-container-registry-typo' into 'master'Rémy Coutable2018-05-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Registry page text is wrong and contains broken links." Closes #45746 See merge request gitlab-org/gitlab-ce!18711
| * | | | | | | | | | | | | Fix a typo in the Registry indexMark Fletcher2018-05-031-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'create-live-trace-only-if-job-is-complete' into 'master'Kamil Trzciński2018-05-213-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Append trace chunk only if job is running Closes #46383 See merge request gitlab-org/gitlab-ce!18969