summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into remove-links-mr-empty-stateremove-links-mr-empty-stateClement Ho2017-12-15148-734/+735
|\
| * Merge branch 'master' into 'master'Rémy Coutable2017-12-152-1/+6
| |\
| | * fix issue #39843 Incorrect guidance stating blocked users will be removed fro...Cesar Apodaca2017-12-152-1/+6
| |/
| * Merge branch '38239-update-toggle-design' into 'master'Filipa Lacerda2017-12-156-51/+81
| |\
| | * Add changelog entry38239-update-toggle-designKushal Pandya2017-12-151-0/+5
| | * Update tests for toggle design changeKushal Pandya2017-12-151-3/+11
| | * Update toggle styles to use iconsKushal Pandya2017-12-151-30/+34
| | * Use icons instead of string labels for togglesKushal Pandya2017-12-153-18/+31
| * | Merge branch 'rc/use-factory_bot_rails' into 'master'Robert Speicher2017-12-15125-175/+175
| |\ \
| | * | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_railsRémy Coutable2017-12-14125-175/+175
| * | | Merge branch 'ph-more-es-modules' into 'master'Filipa Lacerda2017-12-1513-503/+466
| |\ \ \
| | * | | Export JS classes as modulesph-more-es-modulesPhil Hughes2017-12-1513-503/+466
| * | | | Merge branch 'ignore-markdown-cache-when-stubbing-application-settings' into ...Nick Thomas2017-12-152-4/+7
| |\ \ \ \
| | * | | | Don't use Markdown cache for stubbed settings in specsignore-markdown-cache-when-stubbing-application-settingsSean McGivern2017-12-152-4/+7
* | | | | | Merge branch 'master' into 'remove-links-mr-empty-state'Clement Ho2017-12-15530-4796/+7301
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '41073-fix-help-links' into 'master'Rémy Coutable2017-12-151-1/+1
| |\ \ \ \ \
| | * | | | | make link open in new tab41073-fix-help-linksBrett Walker2017-12-131-1/+1
| * | | | | | Fix Rubocop offense in QA project specsGrzegorz Bizon2017-12-151-1/+1
| * | | | | | Merge branch 'qa/gb/gitlab-qa-factories' into 'master'Grzegorz Bizon2017-12-1515-197/+199
| |\ \ \ \ \ \
| | * | | | | | Fix remaining calls to GitLab QA factoriesqa/gb/gitlab-qa-factoriesGrzegorz Bizon2017-12-154-6/+4
| | * | | | | | Rename QA scenarios to make factory concept explicitGrzegorz Bizon2017-12-1512-191/+195
| * | | | | | | Merge branch 'docs/sast' into 'master'Dmitriy Zaporozhets2017-12-151-0/+14
| |\ \ \ \ \ \ \
| | * | | | | | | Add SAST docsAchilleas Pipinellis2017-12-151-0/+14
| * | | | | | | | Merge branch 'dm-ldap-email-readonly' into 'master'Sean McGivern2017-12-1511-45/+108
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make sure user email is read only when synced with LDAPDouwe Maan2017-12-1511-45/+108
| * | | | | | | | | Merge branch '38145_ux_issues_in_system_info_page' into 'master'Sean McGivern2017-12-153-9/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix UX issues in system info pageGilbert Roulot2017-12-153-9/+14
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '41014-bump-svg-version' into 'master'Phil Hughes2017-12-152-4/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update svg package versionFilipa Lacerda2017-12-152-4/+4
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '41136-job-erased' into 'master'Filipa Lacerda2017-12-151-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Change text from build to job in flash notice41136-job-erasedAnnabel Dunstone Gray2017-12-141-1/+1
| * | | | | | | | | | Merge branch 'docs-add-auto-pipeline' into 'master'Achilleas Pipinellis2017-12-151-0/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add note about automatic pipelines when enabling Auto DevOpsFabio Busatto2017-12-151-0/+4
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'patch-29' into 'master'Sean McGivern2017-12-151-9/+13
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix type descriptionMichael Lihs2017-12-141-1/+1
| | * | | | | | | | | fix formatting of parameters for new group and transfer project to groupMichael Lihs2017-12-081-9/+13
| * | | | | | | | | | Merge branch 'gitaly-conflicts-prep' into 'master'Sean McGivern2017-12-153-34/+33
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Simplify conflict resolver interfacegitaly-conflicts-prepAlejandro Rodríguez2017-12-143-34/+33
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'docs-update-documentation-guidelines' into 'master'🚄 Job van der Voort 🚀2017-12-152-83/+91
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Docs update documentation guidelinesMarcia Ramos2017-12-152-83/+91
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch '38541-cancel-alignment' into 'master'Filipa Lacerda2017-12-152-6/+18
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fix button alignment on MWPS component38541-cancel-alignmentSimon Knox2017-12-112-6/+18
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch '41016-import-gitlab-shell-projects' into 'master'Douwe Maan2017-12-158-128/+865
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Import gitlab_projects.rb from gitlab-shellNick Thomas2017-12-148-128/+865
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'backport-ee-3706' into 'master'Dmitriy Zaporozhets2017-12-151-0/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add eager-load paths to autoload paths to fix Rake tasksNick Thomas2017-12-141-0/+4
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'lfs-badge' into 'master'Douwe Maan2017-12-1511-1/+93
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | moved lfs_blob_ids method into ExtractsPath modulelfs-badgePhil Hughes2017-12-143-8/+6
| | * | | | | | | | spec fixesPhil Hughes2017-12-143-4/+4
| | * | | | | | | | moved lfs blob fetch from extractspath filePhil Hughes2017-12-145-6/+11
View Lorry Controller Status