summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch '22846-notifications-broken-during-email-address-change-before-e...Douwe Maan2018-05-230-0/+0
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge branch '46354-deprecate_gemnasium_service' into 'master'Douwe Maan2018-05-238-26/+70
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resolve "Deprecate Gemnasium project service"Olivier Gonzalez2018-05-238-26/+70
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '45530-web-ide-doesn-t-work-for-branches-with-slashes' into 'mas...Douwe Maan2018-05-237-21/+40
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resolve "Web IDE doesn't work for branches with slashes"Tim Zallmann2018-05-237-21/+40
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'ide-commit-state-bug' into 'master'Filipa Lacerda2018-05-232-2/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixed specPhil Hughes2018-05-231-0/+1
| * | | | | | | | | | | added specide-commit-state-bugPhil Hughes2018-05-221-0/+19
| * | | | | | | | | | | Fixed web IDE review & commit editors getting into incorrect statePhil Hughes2018-05-181-2/+7
* | | | | | | | | | | | Merge branch '46603-add-vue-loader-cache' into 'master'Fatih Acet2018-05-233-6/+29
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add file cache to vue-loader to speed up compilation46603-add-vue-loader-cacheMike Greiling2018-05-223-6/+29
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ide-jobs-list' into 'master'Filipa Lacerda2018-05-2313-2/+679
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | group jobs into stageside-jobs-listPhil Hughes2018-05-229-27/+171
| * | | | | | | | | | | | added getter for checking is their is a pipelinePhil Hughes2018-05-226-8/+59
| * | | | | | | | | | | | Show CI jobs in web IDEPhil Hughes2018-05-2211-2/+484
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ide-file-finder-improve-order' into 'master'Filipa Lacerda2018-05-233-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | changed what bit of code stops the callbackide-file-finder-improve-orderPhil Hughes2018-05-222-4/+11
| * | | | | | | | | | | Fixed IDE file finder orderingPhil Hughes2018-05-142-7/+7
* | | | | | | | | | | | 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