Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Hide runner token in CI/CD settings page38019-hide-runner-token | Eric Eastwood | 2017-12-15 | 3 | -3/+149 |
* | Merge branch 'rc/use-factory_bot_rails' into 'master' | Robert Speicher | 2017-12-15 | 116 | -155/+155 |
|\ | |||||
| * | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_rails | Rémy Coutable | 2017-12-14 | 116 | -155/+155 |
* | | Merge branch 'ph-more-es-modules' into 'master' | Filipa Lacerda | 2017-12-15 | 4 | -11/+3 |
|\ \ | |||||
| * | | Export JS classes as modulesph-more-es-modules | Phil Hughes | 2017-12-15 | 4 | -11/+3 |
* | | | 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 'dm-ldap-email-readonly' into 'master' | Sean McGivern | 2017-12-15 | 2 | -13/+52 |
|\ \ \ | |||||
| * | | | Make sure user email is read only when synced with LDAP | Douwe Maan | 2017-12-15 | 2 | -13/+52 |
* | | | | Fix UX issues in system info page | Gilbert Roulot | 2017-12-15 | 1 | -6/+6 |
* | | | | Merge branch 'gitaly-conflicts-prep' into 'master' | Sean McGivern | 2017-12-15 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Simplify conflict resolver interfacegitaly-conflicts-prep | Alejandro Rodríguez | 2017-12-14 | 1 | -1/+1 |
* | | | | | Merge branch '41016-import-gitlab-shell-projects' into 'master' | Douwe Maan | 2017-12-15 | 4 | -93/+494 |
|\ \ \ \ \ | |||||
| * | | | | | Import gitlab_projects.rb from gitlab-shell | Nick Thomas | 2017-12-14 | 4 | -93/+494 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'lfs-badge' into 'master' | Douwe Maan | 2017-12-15 | 4 | -0/+70 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | spec fixes | Phil Hughes | 2017-12-14 | 3 | -4/+4 |
| * | | | | added specs | Phil Hughes | 2017-12-12 | 2 | -0/+68 |
| * | | | | fixed failing tests | Phil Hughes | 2017-12-11 | 2 | -0/+2 |
* | | | | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master' | Robert Speicher | 2017-12-14 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitaly | Ahmad Sherif | 2017-12-13 | 1 | -2/+2 |
* | | | | | | clearer-documentation-on-inline-diffs | Dimitrie Hoekstra | 2017-12-14 | 1 | -3/+14 |
* | | | | | | Merge branch 'ph-es-modules' into 'master' | Filipa Lacerda | 2017-12-14 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Converted JS modules into exported modulesph-es-modules | Phil Hughes | 2017-12-14 | 1 | -2/+2 |
* | | | | | | Merge branch 'dm-batchloader-project' into 'master' | Sean McGivern | 2017-12-14 | 1 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Clear BatchLoader after each spec to prevent holding onto records longer than...dm-batchloader-project | Douwe Maan | 2017-12-14 | 1 | -0/+5 |
| |/ / / / / | |||||
* | | | | | | sorting for tags api | haseeb | 2017-12-14 | 2 | -2/+46 |
* | | | | | | Merge branch 'zj-mr-diff-memoization-bug' into 'master' | Sean McGivern | 2017-12-14 | 2 | -13/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Clear caches before updating MR diffs | Zeger-Jan van de Weg | 2017-12-14 | 2 | -13/+24 |
* | | | | | | | Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual'... | Kamil Trzciński | 2017-12-14 | 2 | -9/+7 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Dependencies Validator fails when depended job is `manual`41110-dependencies-validator-fails-when-depended-job-is-manual | Shinya Maeda | 2017-12-14 | 2 | -9/+7 |
* | | | | | | | Merge branch 'tc-correct-email-in-reply-to' into 'master' | Sean McGivern | 2017-12-14 | 2 | -0/+62 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make discussion mail References all notes in the discussiontc-correct-email-in-reply-to | Toon Claes | 2017-12-13 | 2 | -11/+48 |
| * | | | | | | | Make mail notifications of discussion notes In-Reply-To of each other | Toon Claes | 2017-12-13 | 1 | -0/+25 |
* | | | | | | | | Merge branch '25317-prioritize-author-date-over-commit' into 'master' | Sean McGivern | 2017-12-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix commits_spec25317-prioritize-author-date-over-commit | Annabel Dunstone Gray | 2017-12-13 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'dm-dedicated-sidekiq-queues' into 'master' | Sean McGivern | 2017-12-14 | 12 | -23/+181 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add rubocops to ensure Sidekiq workers include ApplicationWorker and don't ma... | Douwe Maan | 2017-12-13 | 3 | -4/+57 |
| * | | | | | | | | Use a dedicated queue for each worker | Douwe Maan | 2017-12-12 | 10 | -19/+124 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch '38869-datetime' into 'master' | Tim Zallmann | 2017-12-14 | 5 | -101/+99 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into 38869-datetime | Filipa Lacerda | 2017-12-13 | 37 | -338/+926 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into 38869-datetime | Filipa Lacerda | 2017-12-11 | 116 | -851/+2262 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into 38869-datetime | Filipa Lacerda | 2017-12-07 | 26 | -465/+1745 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Export date utility functions as ES6 modules | Filipa Lacerda | 2017-12-07 | 5 | -101/+99 |
* | | | | | | | | | | | Merge branch '13695-order-contributors-in-api' into 'master' | Rémy Coutable | 2017-12-13 | 5 | -3/+167 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Adds ordering to projects contributors in API | Jacopo | 2017-12-13 | 5 | -3/+167 |
* | | | | | | | | | | | | Merge branch 'winh-unify-modals' into 'master' | Filipa Lacerda | 2017-12-13 | 7 | -25/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Rename recaptcha-dialog to recaptcha-modal | Winnie Hellmann | 2017-12-12 | 2 | -5/+5 |
| * | | | | | | | | | | | | Rename popup-dialog to modal | Winnie Hellmann | 2017-12-12 | 5 | -20/+20 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch '33926-update-issuable-icons' into 'master' | Annabel Dunstone Gray | 2017-12-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Update issuable status icons33926-update-issuable-icons | Eric Eastwood | 2017-12-13 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |