summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use Sidekiq `fake` mode (its default) in the test environment22992-default-to-sidekiq-testing-fakeRémy Coutable2017-12-1815-41/+34
* 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
| * | | | | | added specsPhil Hughes2017-12-122-0/+68
| * | | | | | fixed failing testsPhil Hughes2017-12-112-0/+2
| * | | | | | fixed project homepage not having correct variablePhil Hughes2017-12-112-1/+3
| * | | | | | Added LFS badge to indicate LFS tracked filesPhil Hughes2017-12-115-0/+17
* | | | | | | Merge branch 'trigger-user-pipeline-info' into 'master'Grzegorz Bizon2017-12-151-4/+11
|\ \ \ \ \ \ \
| * | | | | | | Make rubocop happyBalasankar "Balu" C2017-12-151-1/+1
| * | | | | | | Use guard clauseBalasankar "Balu" C2017-12-151-3/+1
| * | | | | | | Improve languageBalasankar "Balu" C2017-12-151-4/+6
| * | | | | | | PrettifyBalasankar "Balu" C2017-12-151-4/+9
| * | | | | | | Use temp branchBalasankar "Balu" C2017-12-151-1/+1
| * | | | | | | Pass info about who started the job and which job triggered itBalasankar "Balu" C2017-12-151-1/+3
|/ / / / / / /
* | | | | | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-149-10/+30
|\ \ \ \ \ \ \
| * | | | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-139-10/+30
* | | | | | | | Merge branch 'docs-add-indexes-monitoring' into 'master'Achilleas Pipinellis2017-12-146-82/+96
|\ \ \ \ \ \ \ \
| * | | | | | | | Docs: add indexes for monitoring and performance monitoringMarcia Ramos2017-12-146-82/+96
|/ / / / / / / /
* | | | | | | | Merge branch 'clearer-documentation-on-inline-diffs' into 'master'Achilleas Pipinellis2017-12-142-3/+25
|\ \ \ \ \ \ \ \
View Lorry Controller Status