Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops... | Kamil Trzcinski | 2017-09-07 | 38 | -212/+280 |
|\ | |||||
| * | Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'... | Sean McGivern | 2017-09-07 | 9 | -11/+100 |
| |\ | |||||
| | * | Small refactor after last code review.35012-navigation-add-option-to-change-navigation-color-palette | Ruben Davila | 2017-09-07 | 1 | -3/+3 |
| | * | Use indigo as default theme | Annabel Dunstone Gray | 2017-09-07 | 2 | -3/+3 |
| | * | Add previews in preferences | Annabel Dunstone Gray | 2017-09-06 | 1 | -1/+1 |
| | * | Fix specs; start on light theme | Annabel Dunstone Gray | 2017-09-06 | 2 | -3/+3 |
| | * | Use `table` helper in migration specs | Sean McGivern | 2017-09-06 | 2 | -5/+2 |
| | * | Don't depend on user model in migration spec | Sean McGivern | 2017-09-06 | 2 | -4/+17 |
| | * | Add blue theme | Annabel Dunstone Gray | 2017-09-06 | 1 | -3/+3 |
| | * | Add functionality for two themes | Annabel Dunstone Gray | 2017-09-06 | 1 | -5/+5 |
| | * | Restore some changes from !9199 | Rubén Dávila | 2017-09-06 | 7 | -5/+84 |
| * | | Merge branch 'events-migration-cleanup' into 'master' | Sean McGivern | 2017-09-07 | 7 | -113/+7 |
| |\ \ | |||||
| | * | | Finish migration to the new events setupevents-migration-cleanup | Yorick Peterse | 2017-09-06 | 7 | -113/+7 |
| * | | | Merge branch 'ee_issue_928_backport' into 'master' | Sean McGivern | 2017-09-07 | 18 | -79/+140 |
| |\ \ \ | |||||
| | * | | | api js changes not needed for CE | Simon Knox | 2017-09-06 | 1 | -21/+0 |
| | * | | | backport boards specs | Simon Knox | 2017-09-06 | 12 | -67/+104 |
| | * | | | FE backport of group boards to reduce CE conflicts | Simon Knox | 2017-09-06 | 1 | -1/+22 |
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba... | Simon Knox | 2017-09-06 | 326 | -4578/+17518 |
| | |\ \ \ | |||||
| | * | | | | Backport specs | Felipe Artur | 2017-08-31 | 5 | -11/+34 |
| | * | | | | Continue BE backport | Felipe Artur | 2017-08-31 | 5 | -2/+3 |
| * | | | | | Merge branch 'fly-out-top-level-item' into 'master' | Filipa Lacerda | 2017-09-07 | 5 | -9/+33 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add top level items to fly-out navigation | Phil Hughes | 2017-09-06 | 5 | -9/+33 |
* | | | | | | | Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-table | Zeger-Jan van de Weg | 2017-09-07 | 10 | -19/+712 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'breadcrumbs-extra-btns-remove' into 'master' | Filipa Lacerda | 2017-09-07 | 2 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | spec fixes | Phil Hughes | 2017-09-06 | 2 | -2/+2 |
| * | | | | | | | Merge branch 'wiki_api' into 'master' | Grzegorz Bizon | 2017-09-07 | 1 | -0/+679 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add API support for wiki pages | blackst0ne | 2017-09-07 | 1 | -0/+679 |
| * | | | | | | | | Merge branch 'gitaly-tree-entries-fix' into 'master' | Rémy Coutable | 2017-09-07 | 2 | -8/+21 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fix | Alejandro Rodríguez | 2017-09-06 | 2 | -8/+21 |
| * | | | | | | | | | Merge branch 'rs-update-capybara' into 'master' | Rémy Coutable | 2017-09-07 | 4 | -8/+9 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix failures introduced by Capybara upgraders-update-capybara | Robert Speicher | 2017-09-05 | 4 | -8/+9 |
| * | | | | | | | | | | Merge branch '37023-remove-focus-styles-from-dropdown-empty-link' into 'master' | Tim Zallmann | 2017-09-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Remove focus styles from dropdown empty link37023-remove-focus-styles-from-dropdown-empty-link | Eric Eastwood | 2017-09-05 | 1 | -1/+1 |
| | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into zj/gitlab-ce-zj... | Kamil Trzcinski | 2017-09-06 | 30 | -204/+1057 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'fix/sm/33281-activerecord-recordinvalid-when-build-has-nil-prot... | Kamil Trzciński | 2017-09-06 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix spec | Shinya Maeda | 2017-09-07 | 1 | -1/+1 |
| | * | | | | | | | | | Use before_save :set_protected | Shinya Maeda | 2017-09-06 | 1 | -0/+11 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'anakashima/gitlab-ce-fix_wiki_toc_indent' into 'master' | Sean McGivern | 2017-09-06 | 1 | -0/+36 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | Space before closing brace | Robert Speicher | 2017-09-06 | 1 | -2/+2 |
| | * | | | | | | | | Refactor TableOfContentsFilter's nested table of contents | Robert Speicher | 2017-09-06 | 1 | -30/+34 |
| | * | | | | | | | | Fix indentation level in Wiki's TOC items to regard header level | Akihiro Nakashima | 2017-09-06 | 1 | -6/+38 |
| * | | | | | | | | | Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'37407-error-500-when-creating-a-project-createservice-returns-a-nil-object | Robert Speicher | 2017-09-06 | 2 | -30/+57 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Migrate creating/deleting a branch to Gitalyfeature/migrate-branch-operations-to-gitaly | Ahmad Sherif | 2017-09-06 | 2 | -30/+57 |
| * | | | | | | | | | | Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'... | Douwe Maan | 2017-09-06 | 4 | -50/+186 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-list | Tiago Botelho | 2017-09-06 | 4 | -50/+186 |
| * | | | | | | | | | | | Merge branch '35161_first_time_contributor_badge' into 'master' | Sean McGivern | 2017-09-06 | 4 | -8/+97 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | fix the failing spec35161_first_time_contributor_badge | micael.bergeron | 2017-09-06 | 1 | -2/+2 |
| | * | | | | | | | | | | add controller spec | micael.bergeron | 2017-09-06 | 3 | -24/+25 |
| | * | | | | | | | | | | remove lint | micael.bergeron | 2017-09-06 | 1 | -2/+2 |
| | * | | | | | | | | | | rework the contributor badge | micael.bergeron | 2017-09-06 | 1 | -10/+2 |