summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* removed CHANGELOG as their are no user facing components in this merge requestide-list-merge-requestsPhil Hughes2018-05-301-5/+0
* ability to search merge requestsPhil Hughes2018-05-304-10/+39
* improved stored dataPhil Hughes2018-05-306-3/+45
* Merge branch 'master' into ide-list-merge-requestsPhil Hughes2018-05-30989-5362/+8631
|\
| * 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
| | |\ \ \ \ \ \ \
| | | * | | | | | | Remove password and password_confirmation from whitelisted params in Profiles...Tiago Botelho2018-05-073-2/+18
| | * | | | | | | | Update CHANGELOG.md for 10.8.2Filipa Lacerda2018-05-281-0/+9
| | * | | | | | | | Update CHANGELOG.md for 10.7.5Filipa Lacerda2018-05-281-0/+9
| | * | | | | | | | Update CHANGELOG.md for 10.6.6Filipa Lacerda2018-05-281-0/+10
| * | | | | | | | | Merge branch 'bootstrap-help-block' into 'master'Annabel Gray2018-05-2913-16/+16
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Replace help-block with form-text.text-mutedClement Ho2018-05-2913-16/+16
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'bootstrap-job-log' into 'master'Annabel Gray2018-05-291-0/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Auto wrap job logsClement Ho2018-05-291-0/+4
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'sh-batch-dependent-destroys' into 'master'Robert Speicher2018-05-295-1/+101
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix project destruction failing due to idle in transaction timeoutssh-batch-dependent-destroysStan Hu2018-05-245-1/+101