Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch '22846-notifications-broken-during-email-address-change-before-e... | Douwe Maan | 2018-05-23 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ \ \ \ | Merge branch '46354-deprecate_gemnasium_service' into 'master' | Douwe Maan | 2018-05-23 | 8 | -26/+70 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Resolve "Deprecate Gemnasium project service" | Olivier Gonzalez | 2018-05-23 | 8 | -26/+70 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '45530-web-ide-doesn-t-work-for-branches-with-slashes' into 'mas... | Douwe Maan | 2018-05-23 | 7 | -21/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Resolve "Web IDE doesn't work for branches with slashes" | Tim Zallmann | 2018-05-23 | 7 | -21/+40 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'ide-commit-state-bug' into 'master' | Filipa Lacerda | 2018-05-23 | 2 | -2/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fixed spec | Phil Hughes | 2018-05-23 | 1 | -0/+1 | |
| * | | | | | | | | | | | added specide-commit-state-bug | Phil Hughes | 2018-05-22 | 1 | -0/+19 | |
| * | | | | | | | | | | | Fixed web IDE review & commit editors getting into incorrect state | Phil Hughes | 2018-05-18 | 1 | -2/+7 | |
* | | | | | | | | | | | | Merge branch '46603-add-vue-loader-cache' into 'master' | Fatih Acet | 2018-05-23 | 3 | -6/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | add file cache to vue-loader to speed up compilation46603-add-vue-loader-cache | Mike Greiling | 2018-05-22 | 3 | -6/+29 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ide-jobs-list' into 'master' | Filipa Lacerda | 2018-05-23 | 13 | -2/+679 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | group jobs into stageside-jobs-list | Phil Hughes | 2018-05-22 | 9 | -27/+171 | |
| * | | | | | | | | | | | | added getter for checking is their is a pipeline | Phil Hughes | 2018-05-22 | 6 | -8/+59 | |
| * | | | | | | | | | | | | Show CI jobs in web IDE | Phil Hughes | 2018-05-22 | 11 | -2/+484 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ide-file-finder-improve-order' into 'master' | Filipa Lacerda | 2018-05-23 | 3 | -7/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | changed what bit of code stops the callbackide-file-finder-improve-order | Phil Hughes | 2018-05-22 | 2 | -4/+11 | |
| * | | | | | | | | | | | Fixed IDE file finder ordering | Phil Hughes | 2018-05-14 | 2 | -7/+7 | |
* | | | | | | | | | | | | Merge branch '44895-explicit-merge-conflict' into 'master' | Tim Zallmann | 2018-05-22 | 7 | -15/+52 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | 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 | 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 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 | 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 | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Update no-ee-check with rubocop recommendation. | Dmitriy Zaporozhets | 2018-05-22 | 1 | -3/+2 | |
| * | | | | | | | | | | | Add check for top-level ee directory in CE repo | Dmitriy Zaporozhets | 2018-05-21 | 2 | -0/+20 | |
* | | | | | | | | | | | | Merge branch '22846-notifications-broken-during-email-address-change-before-e... | Douwe Maan | 2018-05-22 | 4 | -41/+107 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | / / / | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | 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 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | 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).ab-46530-mediumtext-for-gpg-keys | Andreas Brandl | 2018-05-22 | 5 | -1/+25 | |
* | | | | | | | | | | 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 errorsh-bump-prometheus-client-mmap | Stan Hu | 2018-05-22 | 3 | -3/+8 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'ce-6114-move-some-features-projects-specs' into 'master' | Rémy Coutable | 2018-05-22 | 1 | -0/+18 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | |
| * | | | | | | | | | 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/drop primary key constraints for composite keys.ab-43706-composite-primary-keys | Andreas Brandl | 2018-05-21 | 2 | -0/+78 |