Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Extract a do_execute method to be overriddence-6127-move-merge-requests-services | Lin Jen-Shin | 2018-05-24 | 1 | -2/+6 |
* | Avoid using expect_any_instance_of | Lin Jen-Shin | 2018-05-23 | 1 | -2/+7 |
* | Merge branch 'use-git-depth-1-on-cng-trigger' into 'master' | Rémy Coutable | 2018-05-23 | 1 | -0/+2 |
|\ | |||||
| * | Set GIT_DEPTH to 1 to speed up cloning for the cloud images triggeruse-git-depth-1-on-cng-trigger | DJ Mountney | 2018-05-22 | 1 | -0/+2 |
* | | Merge branch 'issue-25256' into 'master' | Douwe Maan | 2018-05-23 | 7 | -7/+72 |
|\ \ | |||||
| * | | skip email trim when email is creating new issue | Cameron Crockett | 2018-05-22 | 7 | -7/+72 |
* | | | Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master' | Douwe Maan | 2018-05-23 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Make Repo#squash_in_progress Opt-Outgitaly-repo-squash-in-progress-opt-out | Kim Carlbäcker | 2018-05-22 | 1 | -1/+1 |
* | | | | Merge branch 'gitaly-wiki-get-formatted-data-opt-out' into 'master' | Douwe Maan | 2018-05-23 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Move Wiki::GetFormattedData to OptOutgitaly-wiki-get-formatted-data-opt-out | Kim Carlbäcker | 2018-05-22 | 1 | -1/+1 |
* | | | | | Merge branch 'gitaly-import-project-opt-out' into 'master' | Douwe Maan | 2018-05-23 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Move ImportProject to OptOut in Gitalygitaly-import-project-opt-out | Kim Carlbäcker | 2018-05-22 | 1 | -1/+1 |
* | | | | | | Merge branch 'gitaly-repo-info-attributes-opt-out' into 'master' | Douwe Maan | 2018-05-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move Repository#info_attributes to OptOut in gitalygitaly-repo-info-attributes-opt-out | Kim Carlbäcker | 2018-05-22 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | 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 |