| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | add file cache to vue-loader to speed up compilation46603-add-vue-loader-cache | Mike Greiling | 2018-05-22 | 3 | -6/+29 |
| | | |||||
| * | Merge branch '44895-explicit-merge-conflict' into 'master' | Tim Zallmann | 2018-05-22 | 7 | -15/+52 |
| |\ | | | | | | | | | | | | | Resolve "Make explicit that merge conflict feature commits to source branch" Closes #44895 See merge request gitlab-org/gitlab-ce!18921 | ||||
| | * | Fix sentence for i18n44895-explicit-merge-conflict | Annabel Dunstone Gray | 2018-05-21 | 2 | -13/+23 |
| | | | |||||
| | * | Add internationlization for conflict description | Annabel Dunstone Gray | 2018-05-21 | 2 | -6/+15 |
| | | | |||||
| | * | Update copy; add monospace font to branch names | Annabel Dunstone Gray | 2018-05-21 | 2 | -5/+5 |
| | | | |||||
| | * | Make source branch a link | Annabel Dunstone Gray | 2018-05-21 | 1 | -1/+1 |
| | | | |||||
| | * | Fix merge conflict info | Annabel Dunstone Gray | 2018-05-21 | 1 | -1/+7 |
| | | | |||||
| | * | Make it explicit that merge conflict feature commits to source branch | Annabel Dunstone Gray | 2018-05-21 | 5 | -10/+22 |
| | | | |||||
| * | | Merge branch 'winh-make-it-right-now' into 'master' | Annabel Gray | 2018-05-22 | 2 | -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 periods | Winnie Hellmann | 2018-05-22 | 2 | -19/+85 |
| |/ / | |||||
| * | | Merge branch 'dm-xcode-project-directory' into 'master' | Robert Speicher | 2018-05-22 | 3 | -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-directory | Douwe Maan | 2018-05-22 | 3 | -13/+23 |
| | | | | |||||
| * | | | Merge branch 'fix/unverified-hover-state' into 'master' | Annabel Gray | 2018-05-22 | 2 | -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-black | Murat Dogan | 2018-05-22 | 2 | -0/+9 |
| |/ / / | |||||
| * | | | Merge branch 'workhorse-4.2.1' into 'master' | Alessio Caiazza | 2018-05-22 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | Upgrade workhorse to v4.2.1 See merge request gitlab-org/gitlab-ce!19087 | ||||
| | * | | | Upgrade workhorse to v4.2.1 | Alessio Caiazza | 2018-05-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'dz-no-ee-check' into 'master' | Rémy Coutable | 2018-05-22 | 2 | -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 Zaporozhets | 2018-05-22 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Add check for top-level ee directory in CE repo | Dmitriy Zaporozhets | 2018-05-21 | 2 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | Merge branch ↵ | Douwe Maan | 2018-05-22 | 4 | -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-confirmed | Rémy Coutable | 2018-05-22 | 4 | -41/+107 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Merge branch 'ab-46530-mediumtext-for-gpg-keys' into 'master' | Yorick Peterse | 2018-05-22 | 5 | -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-keys | Andreas Brandl | 2018-05-22 | 5 | -1/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes #46530. | ||||
| * | | | | | | Merge branch 'sh-bump-prometheus-client-mmap' into 'master' | Nick Thomas | 2018-05-22 | 3 | -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-mmap | Stan Hu | 2018-05-22 | 3 | -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 Coutable | 2018-05-22 | 1 | -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.rb | Lin Jen-Shin | 2018-05-22 | 1 | -0/+18 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'ab-42194-keyset-pagination' into 'master' | Yorick Peterse | 2018-05-22 | 3 | -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-pagination | Andreas Brandl | 2018-05-21 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Add keyset pagination for API calls. | Andreas Brandl | 2018-05-21 | 2 | -13/+369 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes #45756. | ||||
| | * | | | | | Refactor and extract DefaultPaginationStrategy. | Andreas Brandl | 2018-05-21 | 2 | -45/+56 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'ab-43706-composite-primary-keys' into 'master' | Yorick Peterse | 2018-05-22 | 6 | -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-keys | Andreas Brandl | 2018-05-21 | 2 | -0/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #43706. | ||||
| | * | | | | | | Add NOT NULL constraints to project_authorizations. | Andreas Brandl | 2018-05-21 | 4 | -5/+48 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Closes #32258. | ||||
| * | | | | | | Merge branch '45827-expose_readme_url_in_project_api' into 'master' | Rémy Coutable | 2018-05-22 | 9 | -6/+57 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose readme url in Project API Closes #45827 See merge request gitlab-org/gitlab-ce!18960 | ||||
| | * | | | | | Expose readme url in Project API | Imre Farkas | 2018-05-22 | 9 | -6/+57 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'rename-merge-request-widget-author-component' into 'master' | Phil Hughes | 2018-05-22 | 5 | -8/+13 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Rename merge request widget author component See merge request gitlab-org/gitlab-ce!19079 | ||||
| | * | | | | | Rename merge request widget author component | George Tsiolis | 2018-05-22 | 5 | -8/+13 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'fj-46411-fix-badge-api-endpoint-route-with-relative-url' into ↵ | Douwe Maan | 2018-05-22 | 3 | -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-url | Francisco Javier López | 2018-05-17 | 3 | -4/+9 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'jira-clarify-docs' into 'master' | Achilleas Pipinellis | 2018-05-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarifying Jira documentaiton See merge request gitlab-org/gitlab-ce!19046 | ||||
| | * | | | | | | | Clarifying Jira documentaiton | Aric Buerer | 2018-05-22 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'fj-46459-fix-expose-url-when-base-url-set' into 'master' | Douwe Maan | 2018-05-22 | 3 | -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 set | Francisco Javier López | 2018-05-22 | 3 | -4/+26 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch '45532-upgrade-vue-loader' into 'master' | Phil Hughes | 2018-05-22 | 3 | -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-loader | Mike Greiling | 2018-05-18 | 1 | -98/+88 |
| | | | | | | | | |||||
| | * | | | | | | move devtool setting into main config object | Mike Greiling | 2018-05-18 | 1 | -3/+2 |
| | | | | | | | | |||||
| | * | | | | | | upgrade to vue-loader 15.0.11 and update webpack config | Mike Greiling | 2018-05-18 | 3 | -92/+66 |
| | | | | | | | | |||||
| * | | | | | | | Update VERSION to 11.0.0-prev11.0.0.prece41861/devops-remove-beta | Mayra Cabrera | 2018-05-21 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'collapsed-contextual-nav-update' into 'master' | Tim Zallmann | 2018-05-21 | 4 | -4/+10 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed 'Overview' to 'Project' in collapsed contextual navigation at a project level See merge request gitlab-org/gitlab-ce!18996 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |