summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Only preload member records for the relevant projects/groups/user in projects...dm-api-projects-members-preloadDouwe Maan2018-05-303-16/+26
* Merge branch 'fix/bitbucket_import_anonymous' into 'master'Douwe Maan2018-05-304-1/+37
|\
| * Import bitbucket issues that are reported by an anonymous userBart Libert2018-05-244-1/+37
* | Merge branch 'sh-fix-submit-not-clearing-local-storage' into 'master'Filipa Lacerda2018-05-304-2/+22
|\ \
| * | Add a regression test for clearing local storage upon issue creationStan Hu2018-05-291-0/+14
| * | Fix local storage not being cleared after creating a new issueStan Hu2018-05-293-2/+8
* | | Merge branch 'patch-25' into 'master'Rémy Coutable2018-05-301-1/+2
|\ \ \
| * | | add CI as option in place of custom hooksBen Bodenmiller2018-05-301-1/+2
|/ / /
* | | Merge branch 'mattermost-api-v4' into 'master'Sean McGivern2018-05-3010-46/+53
|\ \ \
| * | | Updated help text for team list for Mattermost slash commandsHarrison Healey2018-05-293-5/+5
| * | | Updated Mattermost integration to use Mattermost API v4Harrison Healey2018-05-288-42/+49
* | | | Merge branch 'render_super' into 'master'Rémy Coutable2018-05-303-16/+43
|\ \ \ \
| * | | | Add document around `render_ce`render_superLin Jen-Shin2018-05-291-12/+38
| * | | | Unify app/views/shared/issuable/form/_title.html.hamlLin Jen-Shin2018-05-282-4/+5
* | | | | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-3041-64/+840
|\ \ \ \ \
| * | | | | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-2941-64/+840
* | | | | | Merge branch '46844-update-awesome_print-to-1-8-0' into 'master'Dmitriy Zaporozhets2018-05-303-3/+8
|\ \ \ \ \ \
| * | | | | | Update awesome_print to 1.8.0Takuya Noguchi2018-05-293-3/+8
* | | | | | | Merge branch 'bootstrap-pull-float' into 'master'Annabel Gray2018-05-308-15/+15
|\ \ \ \ \ \ \
| * | | | | | | Convert remaining pull-* to float-*Clement Ho2018-05-298-15/+15
* | | | | | | | Merge branch 'fix-snippet-row' into 'master'Annabel Gray2018-05-301-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix snippet rowClement Ho2018-05-291-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch '46877-bootstrap-4-lists' into 'master'Clement Ho2018-05-3021-33/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove duplicate classesAnnabel Dunstone Gray2018-05-291-2/+2
| * | | | | | | | Replace well-list with content-list and hover-listAnnabel Dunstone Gray2018-05-2922-34/+34
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bootstrap-emails-verify-badge' into 'master'Annabel Gray2018-05-303-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix email verification badgeClement Ho2018-05-293-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-bump-rugged-to-0.27.1' into 'master'Robert Speicher2018-05-291-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Bump rugged to 0.27.1 for security fixesStan Hu2018-05-291-1/+1
* | | | | | | | Merge branch 'sh-ruby-cache-key-debian-stretch' into 'master'Robert Speicher2018-05-291-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Upgrade cache key to be clear that Debian Stretch is being usedStan Hu2018-05-291-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'bootstrap-ide-new-file-modal' into 'master'Annabel Gray2018-05-292-18/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix web IDE new entry modal form alignmentClement Ho2018-05-292-18/+12
* | | | | | | Merge branch '6045-extract-ee-specific-specs-lines' into 'master'Robert Speicher2018-05-2912-53/+110
|\ \ \ \ \ \ \
| * | | | | | | Try to fetch the CE branch in EE because sometimes it has the same name6045-extract-ee-specific-specs-linesRémy Coutable2018-05-241-2/+2
| * | | | | | | Reduce CE/EE diff in spec/controllers/projects/project_members_controller_spe...Rémy Coutable2018-05-241-1/+1
| * | | | | | | Reduce CE/EE diff in spec/controllers/projects/issues_controller_spec.rbRémy Coutable2018-05-241-1/+1
| * | | | | | | Reduce CE/EE diff in spec/controllers/projects/imports_controller_spec.rbRémy Coutable2018-05-241-12/+6
| * | | | | | | Reduce CE/EE diff in spec/controllers/projects/group_links_controller_spec.rbRémy Coutable2018-05-241-0/+12
| * | | | | | | Reduce CE/EE diff in spec/controllers/projects/environments_controller_spec.rbRémy Coutable2018-05-242-0/+17
| * | | | | | | Reduce CE/EE diff in app/controllers/projects/clusters_controller.rbRémy Coutable2018-05-242-18/+4
| * | | | | | | Reduce CE/EE diff in spec/controllers/projects/branches_controller_spec.rbRémy Coutable2018-05-241-0/+18
| * | | | | | | Reduce CE/EE diff in spec/controllers/projects/boards_controller_spec.rbRémy Coutable2018-05-241-18/+48
| * | | | | | | Reduce CE/EE diff in spec/controllers/boards/issues_controller_spec.rbRémy Coutable2018-05-241-1/+1
* | | | | | | | Merge remote-tracking branch 'dev/master'Mayra Cabrera2018-05-2919-24/+186
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'security-fj-import-export-assignment' into 'master'Mayra Cabrera2018-05-2912-18/+93
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Blacklisting attributes in the project import processFrancisco Javier López2018-05-1412-18/+93
| * | | | | | | | | Merge branch 'security-dm-delete-deploy-key' into 'master'Mayra Cabrera2018-05-293-4/+47
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix API to remove deploy key from project instead of deleting it entirelyDouwe Maan2018-05-043-4/+47
| * | | | | | | | | | Merge branch 'security-users-can-update-their-password-without-entering-curre...Mayra Cabrera2018-05-293-2/+18
| |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status