Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Only keep screenshots from last run for QA specsqa/rs-screenshot-last-run | Robert Speicher | 2017-12-15 | 1 | -0/+3 |
* | Merge branch 'master' into 'master' | Rémy Coutable | 2017-12-15 | 2 | -1/+6 |
|\ | |||||
| * | fix issue #39843 Incorrect guidance stating blocked users will be removed fro... | Cesar Apodaca | 2017-12-15 | 2 | -1/+6 |
|/ | |||||
* | Merge branch '38239-update-toggle-design' into 'master' | Filipa Lacerda | 2017-12-15 | 6 | -51/+81 |
|\ | |||||
| * | Add changelog entry38239-update-toggle-design | Kushal Pandya | 2017-12-15 | 1 | -0/+5 |
| * | Update tests for toggle design change | Kushal Pandya | 2017-12-15 | 1 | -3/+11 |
| * | Update toggle styles to use icons | Kushal Pandya | 2017-12-15 | 1 | -30/+34 |
| * | Use icons instead of string labels for toggles | Kushal Pandya | 2017-12-15 | 3 | -18/+31 |
* | | Merge branch 'rc/use-factory_bot_rails' into 'master' | Robert Speicher | 2017-12-15 | 125 | -175/+175 |
|\ \ | |||||
| * | | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_rails | Rémy Coutable | 2017-12-14 | 125 | -175/+175 |
* | | | Merge branch 'ph-more-es-modules' into 'master' | Filipa Lacerda | 2017-12-15 | 13 | -503/+466 |
|\ \ \ | |||||
| * | | | Export JS classes as modulesph-more-es-modules | Phil Hughes | 2017-12-15 | 13 | -503/+466 |
* | | | | Merge branch 'ignore-markdown-cache-when-stubbing-application-settings' into ... | Nick Thomas | 2017-12-15 | 2 | -4/+7 |
|\ \ \ \ | |||||
| * | | | | Don't use Markdown cache for stubbed settings in specsignore-markdown-cache-when-stubbing-application-settings | Sean McGivern | 2017-12-15 | 2 | -4/+7 |
* | | | | | Merge branch '41073-fix-help-links' into 'master' | Rémy Coutable | 2017-12-15 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | make link open in new tab41073-fix-help-links | Brett Walker | 2017-12-13 | 1 | -1/+1 |
* | | | | | | Fix Rubocop offense in QA project specs | Grzegorz Bizon | 2017-12-15 | 1 | -1/+1 |
* | | | | | | Merge branch 'qa/gb/gitlab-qa-factories' into 'master' | Grzegorz Bizon | 2017-12-15 | 15 | -197/+199 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix remaining calls to GitLab QA factoriesqa/gb/gitlab-qa-factories | Grzegorz Bizon | 2017-12-15 | 4 | -6/+4 |
| * | | | | | | Rename QA scenarios to make factory concept explicit | Grzegorz Bizon | 2017-12-15 | 12 | -191/+195 |
* | | | | | | | Merge branch 'docs/sast' into 'master' | Dmitriy Zaporozhets | 2017-12-15 | 1 | -0/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add SAST docs | Achilleas Pipinellis | 2017-12-15 | 1 | -0/+14 |
* | | | | | | | | Merge branch 'dm-ldap-email-readonly' into 'master' | Sean McGivern | 2017-12-15 | 11 | -45/+108 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make sure user email is read only when synced with LDAP | Douwe Maan | 2017-12-15 | 11 | -45/+108 |
* | | | | | | | | | Merge branch '38145_ux_issues_in_system_info_page' into 'master' | Sean McGivern | 2017-12-15 | 3 | -9/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix UX issues in system info page | Gilbert Roulot | 2017-12-15 | 3 | -9/+14 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch '41014-bump-svg-version' into 'master' | Phil Hughes | 2017-12-15 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update svg package version | Filipa Lacerda | 2017-12-15 | 2 | -4/+4 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch '41136-job-erased' into 'master' | Filipa Lacerda | 2017-12-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Change text from build to job in flash notice41136-job-erased | Annabel Dunstone Gray | 2017-12-14 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'docs-add-auto-pipeline' into 'master' | Achilleas Pipinellis | 2017-12-15 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add note about automatic pipelines when enabling Auto DevOps | Fabio Busatto | 2017-12-15 | 1 | -0/+4 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'patch-29' into 'master' | Sean McGivern | 2017-12-15 | 1 | -9/+13 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix type description | Michael Lihs | 2017-12-14 | 1 | -1/+1 |
| * | | | | | | | | | fix formatting of parameters for new group and transfer project to group | Michael Lihs | 2017-12-08 | 1 | -9/+13 |
* | | | | | | | | | | Merge branch 'gitaly-conflicts-prep' into 'master' | Sean McGivern | 2017-12-15 | 3 | -34/+33 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Simplify conflict resolver interfacegitaly-conflicts-prep | Alejandro Rodríguez | 2017-12-14 | 3 | -34/+33 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'docs-update-documentation-guidelines' into 'master' | 🚄 Job van der Voort 🚀 | 2017-12-15 | 2 | -83/+91 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Docs update documentation guidelines | Marcia Ramos | 2017-12-15 | 2 | -83/+91 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '38541-cancel-alignment' into 'master' | Filipa Lacerda | 2017-12-15 | 2 | -6/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fix button alignment on MWPS component38541-cancel-alignment | Simon Knox | 2017-12-11 | 2 | -6/+18 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '41016-import-gitlab-shell-projects' into 'master' | Douwe Maan | 2017-12-15 | 8 | -128/+865 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Import gitlab_projects.rb from gitlab-shell | Nick Thomas | 2017-12-14 | 8 | -128/+865 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'backport-ee-3706' into 'master' | Dmitriy Zaporozhets | 2017-12-15 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add eager-load paths to autoload paths to fix Rake tasks | Nick Thomas | 2017-12-14 | 1 | -0/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'lfs-badge' into 'master' | Douwe Maan | 2017-12-15 | 11 | -1/+93 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | moved lfs_blob_ids method into ExtractsPath modulelfs-badge | Phil Hughes | 2017-12-14 | 3 | -8/+6 |
| * | | | | | | | | spec fixes | Phil Hughes | 2017-12-14 | 3 | -4/+4 |
| * | | | | | | | | moved lfs blob fetch from extractspath file | Phil Hughes | 2017-12-14 | 5 | -6/+11 |
| * | | | | | | | | added specs | Phil Hughes | 2017-12-12 | 2 | -0/+68 |