summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \
| * | | | | | | Add js prefix for issuable-editadd-js-prefix-issuable-editClement Ho2017-12-081-1/+1
* | | | | | | | Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master'Filipa Lacerda2017-12-123-165/+254
|\ \ \ \ \ \ \ \
| * | | | | | | | Use shared interceptor in note specs37619-fix-vue-typeerror-not-failing-the-buildEric Eastwood2017-12-112-205/+215
| * | | | | | | | Try to clean up legit Vue error that was patched overEric Eastwood2017-12-102-22/+91
| * | | | | | | | Add Vue errorHandlor to remove rogue logged TypeErrorsEric Eastwood2017-12-101-1/+11
* | | | | | | | | Merge branch '41023-activerecord-staleobjecterror--attempted-to-update-a-stal...Kamil Trzciński2017-12-121-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-buildShinya Maeda2017-12-121-0/+13
* | | | | | | | | | Merge branch '40997-pipeline-null' into 'master'Phil Hughes2017-12-121-0/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Check for null in job tooltip title40997-pipeline-nullFilipa Lacerda2017-12-111-0/+31
* | | | | | | | | | | Merge branch '39608-comment-on-image-discussions-tab-alignment' into 'master'Tim Zallmann2017-12-121-8/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix comment on image discussion icon alignment39608-comment-on-image-discussions-tab-alignmentEric Eastwood2017-12-081-8/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'issue-note-rename' into 'master'Fatih Acet2017-12-116-9/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rename remaining issue_ prefixed filesissue-note-renameSimon Knox2017-12-096-9/+9
* | | | | | | | | | | Merge branch 'gitaly-mirroring-prep' into 'master'Robert Speicher2017-12-111-18/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add feature flag to use gitaly-ssh mirroring when cloning internal reposAlejandro Rodríguez2017-12-061-18/+3
* | | | | | | | | | | | Merge branch 'backport-epic-in-issue' into 'master'Jacob Schatz2017-12-112-24/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Backport epic in issueepic-in-issuebackport-epic-in-issueClement Ho2017-12-072-24/+30
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'url-utility-es-module' into 'master'Filipa Lacerda2017-12-1119-63/+68
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'url-utility-es-module'Phil Hughes2017-12-1149-272/+1260
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | fix missed gl.utils.visitUrl spyPhil Hughes2017-12-081-2/+2
| * | | | | | | | | | | remove utl util imports from boards specsPhil Hughes2017-12-083-3/+0
| * | | | | | | | | | | use exported methods instead of gl.utilsPhil Hughes2017-12-0816-58/+66
* | | | | | | | | | | | Merge branch '35724-animate-sidebar' into 'master'Filipa Lacerda2017-12-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Animate contextual sidebar; change class names for easier readabilityAnnabel Dunstone Gray2017-12-071-2/+2
* | | | | | | | | | | | Merge branch 'add-remove-column-cop' into 'master'Rémy Coutable2017-12-111-0/+68
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Add cop for use of remove_columnadd-remove-column-copSean McGivern2017-12-111-0/+68
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |