summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-pick-security-into-master' into 'master'Douwe Maan2017-09-082-11/+47
* Merge branch '30473-allow-creation-of-subgroups-with-gitlab_default_can_creat...Douwe Maan2017-09-072-2/+7
|\
| * Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-falseRuben Davila2017-09-072-2/+7
* | Merge branch '35558-only-one-garbage-collection-should-be-running-per-project...Douwe Maan2017-09-071-2/+8
|\ \ | |/ |/|
| * Adds exclusive lease to Git garbage collect worker.35558-only-one-garbage-collection-should-be-running-per-project-at-onceTiago Botelho2017-09-071-2/+8
* | Merge branch 'sh-add-grape-logging' into 'master'Sean McGivern2017-09-072-0/+30
|\ \
| * | Use a custom GrapeLogging formatter to get the timestampsh-add-grape-loggingStan Hu2017-09-073-9/+21
| * | Fix Rubocop failures in API loggerStan Hu2017-09-072-4/+5
| * | Add JSON logger in `log/api_json.log` for Grape API endpointsStan Hu2017-09-062-0/+17
| |/
* | Gitaly feature toggles are on by default in development environmentsAndrew Newdigate2017-09-071-8/+28
* | Merge branch 'zj-auto-devops-table' into 'master'Kamil Trzciński2017-09-072-1/+3
|\ \
| * \ Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops...Kamil Trzcinski2017-09-077-5/+100
| |\ \
| * \ \ Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-076-7/+116
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into zj/gitlab-ce-zj...Kamil Trzcinski2017-09-0628-266/+548
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0642-255/+1104
| |\ \ \ \
| * | | | | Incorporate reviewZeger-Jan van de Weg2017-09-041-1/+1
| * | | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0449-96/+578
| |\ \ \ \ \
| * | | | | | Fix testsZeger-Jan van de Weg2017-09-042-1/+2
| * | | | | | Form for setting project auto devops settingsZeger-Jan van de Weg2017-08-311-1/+2
* | | | | | | Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-076-5/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-076-5/+6
* | | | | | | Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'...Sean McGivern2017-09-072-1/+85
|\ \ \ \ \ \ \
| * | | | | | | Small refactor after last code review.35012-navigation-add-option-to-change-navigation-color-paletteRuben Davila2017-09-071-6/+4
| * | | | | | | Use indigo as default themeAnnabel Dunstone Gray2017-09-071-1/+1
| * | | | | | | Add previews in preferencesAnnabel Dunstone Gray2017-09-061-1/+1
| * | | | | | | Fix specs; start on light themeAnnabel Dunstone Gray2017-09-061-1/+3
| * | | | | | | Add blue themeAnnabel Dunstone Gray2017-09-061-1/+2
| * | | | | | | Add functionality for two themesAnnabel Dunstone Gray2017-09-061-6/+2
| * | | | | | | Restore some changes from !9199Rubén Dávila2017-09-062-1/+88
* | | | | | | | Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-075-4/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-065-4/+14
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-071-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba...Simon Knox2017-09-06117-410/+1997
| |\ \ \ \ \ \ \
| * | | | | | | | Fix specs BACKPORTFelipe Artur2017-09-041-0/+1
* | | | | | | | | Merge branch 'wiki_api' into 'master'Grzegorz Bizon2017-09-074-0/+106
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add API support for wiki pagesblackst0ne2017-09-074-0/+106
* | | | | | | | | | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-062-7/+10
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'anakashima/gitlab-ce-fix_wiki_toc_indent' into 'master'Sean McGivern2017-09-061-18/+72
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Refactor table of contents buildingRobert Speicher2017-09-061-19/+11
| * | | | | | | | Refactor `HeaderNode#find_parent`Robert Speicher2017-09-061-6/+7
| * | | | | | | | Refactor TableOfContentsFilter's nested table of contentsRobert Speicher2017-09-061-42/+64
| * | | | | | | | Fix indentation level in Wiki's TOC items to regard header levelAkihiro Nakashima2017-09-061-4/+43
* | | | | | | | | Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'37407-error-500-when-creating-a-project-createservice-returns-a-nil-objectRobert Speicher2017-09-064-14/+67
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Migrate creating/deleting a branch to Gitalyfeature/migrate-branch-operations-to-gitalyAhmad Sherif2017-09-064-14/+67
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'...Douwe Maan2017-09-063-1/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-064-8/+16
| * | | | | | | | | Adds CommitDescriptionRendererTiago Botelho2017-09-061-0/+7
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-061-1/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-061-1/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'url-sanitizer-fixes' into 'master'Douwe Maan2017-09-061-6/+13
|\ \ \ \ \ \ \ \
View Lorry Controller Status