summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | use class variables instead of CONSTANTsPawel Chojnacki2017-12-121-2/+2
| * | | | Use AtomicFixNum to implement CAS isolated cache update.Pawel Chojnacki2017-12-121-4/+9
| * | | | Implemente measurement enabled cache using AtomicReferencePawel Chojnacki2017-12-121-2/+2
| * | | | Implement simple in memory cache that expires after 5 minutesPawel Chojnacki2017-12-121-6/+24
| * | | | Cache feature check for 5 minutes for MethodCall instrumentation togglePawel Chojnacki2017-12-121-0/+11
* | | | | Merge branch 'add-tcp-check-rake-task' into 'master'Rémy Coutable2017-12-131-0/+32
|\ \ \ \ \
| * | | | | Add a gitlab:tcp_check rake taskNick Thomas2017-12-131-0/+32
* | | | | | Merge branch 'issue_41021' into 'master'Sean McGivern2017-12-134-5/+35
|\ \ \ \ \ \
| * | | | | | Prevent worker that updates merge requests head pipeline from failing jobsFelipe Artur2017-12-134-5/+35
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bvl-backport-migration-spec-changes-to-ce' into 'master'Douwe Maan2017-12-134-29/+31
|\ \ \ \ \ \
| * | | | | | Create models directly in migration specsbvl-backport-migration-spec-changes-to-ceBob Van Landuyt2017-12-124-29/+31
* | | | | | | Merge branch 'fix-create-mr-from-issue-with-template' into 'master'Rémy Coutable2017-12-131-0/+12
|\ \ \ \ \ \ \
| * | | | | | | Execute quick actions when creating MR from issuefix-create-mr-from-issue-with-templateSean McGivern2017-12-131-0/+12
* | | | | | | | Merge branch 'new-nav-tech-debt' into 'master'Phil Hughes2017-12-131-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename page-with-sidebar to layout-pagenew-nav-tech-debtAnnabel Dunstone Gray2017-12-081-1/+1
* | | | | | | | | Export old code into es6 modulesFilipa Lacerda2017-12-132-40/+38
* | | | | | | | | Merge branch '40468-empty-states' into 'master'Tim Zallmann2017-12-131-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into 40468-empty-statesFilipa Lacerda2017-12-1249-380/+749
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix broken testFilipa Lacerda2017-12-111-1/+1
* | | | | | | | | | Fix spec by avoiding monkeypatchingMichael Kozono2017-12-121-4/+13
* | | | | | | | | | Merge branch 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using...Robert Speicher2017-12-124-8/+284
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenterRémy Coutable2017-12-123-0/+12
| * | | | | | | | | | Refactor member view by using presenterTM Lee2017-12-113-8/+272
* | | | | | | | | | | Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-122-1/+15
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Fix rubocop offenceZeger-Jan van de Weg2017-12-121-1/+0
| * | | | | | | | | | Use memoization for commits on diffsZeger-Jan van de Weg2017-12-122-1/+16
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sophie-h/gitlab-ce-patch-15' into 'master'pawel/update-prometheus_gem_to_highly_optimized_versionSean McGivern2017-12-123-0/+153
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Hide issues and MRs in labels list if disabledsophie-h/gitlab-ce-patch-15Sophie Herold2017-12-113-0/+153
* | | | | | | | | | | Merge branch 'repo-write-ref-client-prep' into 'master'Robert Speicher2017-12-122-2/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move Repository#write_ref to Git::Repository#write_refrepo-write-ref-client-prepKim "BKC" Carlbäcker2017-12-122-2/+20
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'optimize-issues-avoid-noop-empty-cache-updates2' into 'master'Sean McGivern2017-12-121-0/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Treat empty markdown and html strings as valid cached text, not missing cache...optimize-issues-avoid-noop-empty-cache-updates2Greg Stark2017-12-121-0/+20
* | | | | | | | | | | | Merge branch 'single-list-multiple-clusters' into 'master'Kamil Trzciński2017-12-122-39/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove tab navigation from clusters/indexMatija Čupić2017-12-111-11/+0
| * | | | | | | | | | | | Remove cluster scope from ClustersController#indexMatija Čupić2017-12-111-28/+0
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rc/backport-ee-fix' into 'master'Kamil Trzciński2017-12-121-18/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Backport a spec fix done in EE (5dbecb8e) to CERémy Coutable2017-12-111-18/+8
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jprovazn-description' into 'master'Sean McGivern2017-12-123-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Use message body for merge request descriptionjprovazn-descriptionJan Provaznik2017-12-113-0/+32
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'add-js-prefix-issuable-edit' into 'master'Filipa Lacerda2017-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \