summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix style offensesrestore-registry-cngAhmad Hassan2018-05-241-4/+5
* Finalize registry restore into CNGAhmad Hassan2018-05-241-32/+23
* Implement registry restore in CNGAhmad Hassan2018-05-232-2/+68
* Merge branch 'issue-25256' into 'master'Douwe Maan2018-05-237-7/+72
|\
| * skip email trim when email is creating new issueCameron Crockett2018-05-227-7/+72
* | Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \
| * | Make Repo#squash_in_progress Opt-Outgitaly-repo-squash-in-progress-opt-outKim Carlbäcker2018-05-221-1/+1
* | | Merge branch 'gitaly-wiki-get-formatted-data-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \
| * | | Move Wiki::GetFormattedData to OptOutgitaly-wiki-get-formatted-data-opt-outKim Carlbäcker2018-05-221-1/+1
* | | | Merge branch 'gitaly-import-project-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ \
| * | | | Move ImportProject to OptOut in Gitalygitaly-import-project-opt-outKim Carlbäcker2018-05-221-1/+1
* | | | | Merge branch 'gitaly-repo-info-attributes-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ \ \
| * | | | | Move Repository#info_attributes to OptOut in gitalygitaly-repo-info-attributes-opt-outKim Carlbäcker2018-05-221-1/+1
| | |/ / / | |/| | |
* | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
View Lorry Controller Status