summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ph-more-es-modules' into 'master'Filipa Lacerda2017-12-154-11/+3
|\
| * Export JS classes as modulesph-more-es-modulesPhil Hughes2017-12-154-11/+3
* | 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 'dm-ldap-email-readonly' into 'master'Sean McGivern2017-12-152-13/+52
|\ \ \
| * | | Make sure user email is read only when synced with LDAPDouwe Maan2017-12-152-13/+52
* | | | Fix UX issues in system info pageGilbert Roulot2017-12-151-6/+6
* | | | Merge branch 'gitaly-conflicts-prep' into 'master'Sean McGivern2017-12-151-1/+1
|\ \ \ \
| * | | | Simplify conflict resolver interfacegitaly-conflicts-prepAlejandro Rodríguez2017-12-141-1/+1
* | | | | Merge branch '41016-import-gitlab-shell-projects' into 'master'Douwe Maan2017-12-154-93/+494
|\ \ \ \ \
| * | | | | Import gitlab_projects.rb from gitlab-shellNick Thomas2017-12-144-93/+494
| | |_|/ / | |/| | |
* | | | | Merge branch 'lfs-badge' into 'master'Douwe Maan2017-12-154-0/+70
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | spec fixesPhil Hughes2017-12-143-4/+4
| * | | | added specsPhil Hughes2017-12-122-0/+68
| * | | | fixed failing testsPhil Hughes2017-12-112-0/+2
* | | | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-141-2/+2
|\ \ \ \ \
| * | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-131-2/+2
* | | | | | clearer-documentation-on-inline-diffsDimitrie Hoekstra2017-12-141-3/+14
* | | | | | Merge branch 'ph-es-modules' into 'master'Filipa Lacerda2017-12-141-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Converted JS modules into exported modulesph-es-modulesPhil Hughes2017-12-141-2/+2
* | | | | | Merge branch 'dm-batchloader-project' into 'master'Sean McGivern2017-12-141-0/+5
|\ \ \ \ \ \
| * | | | | | Clear BatchLoader after each spec to prevent holding onto records longer than...dm-batchloader-projectDouwe Maan2017-12-141-0/+5
| |/ / / / /
* | | | | | sorting for tags apihaseeb2017-12-142-2/+46
* | | | | | Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-142-13/+24
|\ \ \ \ \ \
| * | | | | | Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-142-13/+24
* | | | | | | Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual'...Kamil Trzciński2017-12-142-9/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Dependencies Validator fails when depended job is `manual`41110-dependencies-validator-fails-when-depended-job-is-manualShinya Maeda2017-12-142-9/+7
* | | | | | | Merge branch 'tc-correct-email-in-reply-to' into 'master'Sean McGivern2017-12-142-0/+62
|\ \ \ \ \ \ \
| * | | | | | | Make discussion mail References all notes in the discussiontc-correct-email-in-reply-toToon Claes2017-12-132-11/+48
| * | | | | | | Make mail notifications of discussion notes In-Reply-To of each otherToon Claes2017-12-131-0/+25
* | | | | | | | Merge branch '25317-prioritize-author-date-over-commit' into 'master'Sean McGivern2017-12-141-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix commits_spec25317-prioritize-author-date-over-commitAnnabel Dunstone Gray2017-12-131-1/+1
* | | | | | | | | Merge branch 'dm-dedicated-sidekiq-queues' into 'master'Sean McGivern2017-12-1412-23/+181
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add rubocops to ensure Sidekiq workers include ApplicationWorker and don't ma...Douwe Maan2017-12-133-4/+57
| * | | | | | | | Use a dedicated queue for each workerDouwe Maan2017-12-1210-19/+124
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '38869-datetime' into 'master'Tim Zallmann2017-12-145-101/+99
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-1337-338/+926
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-11116-851/+2262
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-0726-465/+1745
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Export date utility functions as ES6 modulesFilipa Lacerda2017-12-075-101/+99
* | | | | | | | | | | Merge branch '13695-order-contributors-in-api' into 'master'Rémy Coutable2017-12-135-3/+167
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Adds ordering to projects contributors in APIJacopo2017-12-135-3/+167
* | | | | | | | | | | | Merge branch 'winh-unify-modals' into 'master'Filipa Lacerda2017-12-137-25/+25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Rename recaptcha-dialog to recaptcha-modalWinnie Hellmann2017-12-122-5/+5
| * | | | | | | | | | | | Rename popup-dialog to modalWinnie Hellmann2017-12-125-20/+20
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '33926-update-issuable-icons' into 'master'Annabel Dunstone Gray2017-12-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-131-1/+1
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'pawel/cache_feature_check_for_5_minutes_for_method_call' into '...Robert Speicher2017-12-131-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix test case descriptionPawel Chojnacki2017-12-131-1/+1
| * | | | | | | | | | | | Expire feature flag cache after 1minutePawel Chojnacki2017-12-121-5/+3