summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use get_object_https_url instead of get_object_urluse-get_object_https_url-with-direct-uploderShinya Maeda2018-05-241-1/+1
* Merge branch '44895-explicit-merge-conflict' into 'master'Tim Zallmann2018-05-227-15/+52
|\
| * Fix sentence for i18n44895-explicit-merge-conflictAnnabel Dunstone Gray2018-05-212-13/+23
| * Add internationlization for conflict descriptionAnnabel Dunstone Gray2018-05-212-6/+15
| * Update copy; add monospace font to branch namesAnnabel Dunstone Gray2018-05-212-5/+5
| * Make source branch a linkAnnabel Dunstone Gray2018-05-211-1/+1
| * Fix merge conflict infoAnnabel Dunstone Gray2018-05-211-1/+7
| * Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray2018-05-215-10/+22
* | Merge branch 'winh-make-it-right-now' into 'master'Annabel Gray2018-05-222-19/+85
|\ \
| * | 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 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-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.1Alessio Caiazza2018-05-221-1/+1
* | | | Merge branch 'dz-no-ee-check' into 'master'Rémy Coutable2018-05-222-0/+19
|\ \ \ \
| * | | | Update no-ee-check with rubocop recommendation.Dmitriy Zaporozhets2018-05-221-3/+2
| * | | | Add check for top-level ee directory in CE repoDmitriy Zaporozhets2018-05-212-0/+20
* | | | | Merge branch '22846-notifications-broken-during-email-address-change-before-e...Douwe Maan2018-05-224-41/+107
|\ \ \ \ \
| * | | | | 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
* | | | | | Merge branch 'ab-46530-mediumtext-for-gpg-keys' into 'master'Yorick Peterse2018-05-225-1/+25
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Increase text limit for GPG keys (mysql only).ab-46530-mediumtext-for-gpg-keysAndreas Brandl2018-05-225-1/+25
* | | | | | 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 errorsh-bump-prometheus-client-mmapStan Hu2018-05-223-3/+8
|/ / / / /
* | | | | Merge branch 'ce-6114-move-some-features-projects-specs' into 'master'Rémy Coutable2018-05-221-0/+18
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \
| * | | | | 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
| * | | | | 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/drop primary key constraints for composite keys.ab-43706-composite-primary-keysAndreas Brandl2018-05-212-0/+78
| * | | | | | Add NOT NULL constraints to project_authorizations.Andreas Brandl2018-05-214-5/+48
| |/ / / / /
* | | | | | Merge branch '45827-expose_readme_url_in_project_api' into 'master'Rémy Coutable2018-05-229-6/+57
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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 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
|\ \ \ \ \ \
| * | | | | | 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 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 setFrancisco Javier López2018-05-223-4/+26
|/ / / / / / /
* | | | | | | Merge branch '45532-upgrade-vue-loader' into 'master'Phil Hughes2018-05-223-190/+153
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 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
|\ \ \ \ \ \ \
View Lorry Controller Status