summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Upgrade to Ruby 2.4.4sh-bump-ruby-2.4Stan Hu2018-05-2915-18/+27
* 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
* | | | | | | | | Merge branch '38325-variables-usage-in-gitlab-ci-yml-docs' into 'master'Achilleas Pipinellis2018-05-294-52/+135
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add documentation about variables usage in GitLab CITomasz Maczukin2018-05-294-52/+135
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ab-35364-throttle-updates-last-repository-at' into 'master'Yorick Peterse2018-05-293-0/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Throttle updates to Project#last_repository_updated_at.Andreas Brandl2018-05-293-0/+20
* | | | | | | | | | Merge branch '46758-fallout-of-cacheable-attribute' into 'master'Douwe Maan2018-05-2913-168/+183
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow comment after if/unless clause46758-fallout-of-cacheable-attributeRémy Coutable2018-05-292-1/+13
| * | | | | | | | | | Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set wh...Rémy Coutable2018-05-2911-167/+170
* | | | | | | | | | | Merge branch '46885-group-visibility' into 'master'Clement Ho2018-05-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix alignment of visibility options on new group pageAnnabel Dunstone Gray2018-05-291-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'bootstrap-fixes-from-ee' into 'master'Annabel Gray2018-05-293-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add bootstrap fixes that were in EE but were mismatching in CEClement Ho2018-05-293-4/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '46849-update-rdoc-to-6-0-4' into 'master'Robert Speicher2018-05-293-4/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update rdoc to 6.0.4Takuya Noguchi2018-05-273-4/+8
* | | | | | | | | | | Merge branch 'branches-fixes' into 'master'Clement Ho2018-05-292-2/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix branches panel at smaller screen sizesbranches-fixesAnnabel Dunstone Gray2018-05-252-2/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch '46852-remove-always-on-spinner' into 'master'Clement Ho2018-05-294-21/+32
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Resolve "Merge request spinner spins forever after loading the diff"Lukas Eipert2018-05-294-21/+32
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'patch-26' into 'master'Achilleas Pipinellis2018-05-291-1/+10
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status