summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-077-113/+7
|\
| * Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-067-113/+7
* | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-0718-79/+140
|\ \
| * | api js changes not needed for CESimon Knox2017-09-061-21/+0
| * | backport boards specsSimon Knox2017-09-0612-67/+104
| * | FE backport of group boards to reduce CE conflictsSimon Knox2017-09-061-1/+22
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba...Simon Knox2017-09-06326-4578/+17518
| |\ \
| * | | Backport specsFelipe Artur2017-08-315-11/+34
| * | | Continue BE backportFelipe Artur2017-08-315-2/+3
* | | | Merge branch 'fly-out-top-level-item' into 'master'Filipa Lacerda2017-09-075-9/+33
|\ \ \ \
| * | | | Add top level items to fly-out navigationPhil Hughes2017-09-065-9/+33
* | | | | Merge branch 'breadcrumbs-extra-btns-remove' into 'master'Filipa Lacerda2017-09-072-2/+2
|\ \ \ \ \
| * | | | | spec fixesPhil Hughes2017-09-062-2/+2
* | | | | | Merge branch 'wiki_api' into 'master'Grzegorz Bizon2017-09-071-0/+679
|\ \ \ \ \ \
| * | | | | | Add API support for wiki pagesblackst0ne2017-09-071-0/+679
* | | | | | | Merge branch 'gitaly-tree-entries-fix' into 'master'Rémy Coutable2017-09-072-8/+21
|\ \ \ \ \ \ \
| * | | | | | | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-062-8/+21
* | | | | | | | Merge branch 'rs-update-capybara' into 'master'Rémy Coutable2017-09-074-8/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix failures introduced by Capybara upgraders-update-capybaraRobert Speicher2017-09-054-8/+9
* | | | | | | | | Merge branch '37023-remove-focus-styles-from-dropdown-empty-link' into 'master'Tim Zallmann2017-09-071-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Remove focus styles from dropdown empty link37023-remove-focus-styles-from-dropdown-empty-linkEric Eastwood2017-09-051-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'fix/sm/33281-activerecord-recordinvalid-when-build-has-nil-prot...Kamil Trzciński2017-09-061-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix specShinya Maeda2017-09-071-1/+1
| * | | | | | | | Use before_save :set_protectedShinya Maeda2017-09-061-0/+11
| |/ / / / / / /
* | | | | | | | Merge branch 'anakashima/gitlab-ce-fix_wiki_toc_indent' into 'master'Sean McGivern2017-09-061-0/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Space before closing braceRobert Speicher2017-09-061-2/+2
| * | | | | | | | Refactor TableOfContentsFilter's nested table of contentsRobert Speicher2017-09-061-30/+34
| * | | | | | | | Fix indentation level in Wiki's TOC items to regard header levelAkihiro Nakashima2017-09-061-6/+38
* | | | | | | | | Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'37407-error-500-when-creating-a-project-createservice-returns-a-nil-objectRobert Speicher2017-09-062-30/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Migrate creating/deleting a branch to Gitalyfeature/migrate-branch-operations-to-gitalyAhmad Sherif2017-09-062-30/+57
* | | | | | | | | | Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'...Douwe Maan2017-09-064-50/+186
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-064-50/+186
* | | | | | | | | | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-064-8/+97
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fix the failing spec35161_first_time_contributor_badgemicael.bergeron2017-09-061-2/+2
| * | | | | | | | | | add controller specmicael.bergeron2017-09-063-24/+25
| * | | | | | | | | | remove lintmicael.bergeron2017-09-061-2/+2
| * | | | | | | | | | rework the contributor badgemicael.bergeron2017-09-061-10/+2
| * | | | | | | | | | round of fixes after code reviewmicael.bergeron2017-09-062-19/+42
| * | | | | | | | | | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-062-71/+79
| * | | | | | | | | | fix #35161, add a first-time contributor badgemicael.bergeron2017-09-061-0/+65
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '35441-fix-division-by-zero' into 'master'Robert Speicher2017-09-061-10/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor blame helper age class testsJeff Stubler2017-09-051-22/+15
| * | | | | | | | | | Fix division by zero for blame age mapJeff Stubler2017-08-241-1/+15
* | | | | | | | | | | Merge branch 'url-sanitizer-fixes' into 'master'Douwe Maan2017-09-061-50/+129
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove blank passwords from sanitized URLsNick Thomas2017-09-061-51/+129
| * | | | | | | | | | | Backport EE fixes to Gitlab::UrlSanitizer to CENick Thomas2017-09-061-0/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-063-15/+151
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into feature/gb/downl...Grzegorz Bizon2017-09-0690-2620/+9396
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix artifacts controller specsGrzegorz Bizon2017-09-061-8/+0
| * | | | | | | | | | | | Extract job artifacts API code to a separate fileGrzegorz Bizon2017-09-061-2/+3