summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into gitaly-feature-...gitaly-feature-toggles-development-opt-outAndrew Newdigate2017-09-07512-4080/+11660
|\
| * Merge branch 'gitaly-tree-entries-fix' into 'master'Rémy Coutable2017-09-078-20/+38
| |\
| | * Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-068-20/+38
| * | Merge branch 'rs-update-capybara' into 'master'Rémy Coutable2017-09-076-13/+15
| |\ \
| | * | Fix failures introduced by Capybara upgraders-update-capybaraRobert Speicher2017-09-054-8/+9
| | * | Update capybara 2.6.2 -> 2.15.1Robert Speicher2017-09-052-5/+6
| * | | Merge branch 'fix-mr-tabs-position' into 'master'Phil Hughes2017-09-073-8/+16
| |\ \ \
| | * | | Fix mr tabs positionAnnabel Dunstone Gray2017-09-073-8/+16
| |/ / /
| * | | Merge branch 'docs/autodeploy-refactor' into 'master'Achilleas Pipinellis2017-09-077-27/+151
| |\ \ \
| | * | | Remove confusing Nginx example from Autodeploy docsdocs/autodeploy-refactorAchilleas Pipinellis2017-09-062-79/+17
| | * | | Refactor Autodeploy docsAchilleas Pipinellis2017-09-061-38/+53
| | * | | Add images from auto deploy guideAchilleas Pipinellis2017-09-065-0/+0
| | * | | Port changes from Autodeploy EE to CEAchilleas Pipinellis2017-09-062-0/+171
| * | | | Merge branch 'mk-remove-duplicate-task' into 'master'Douwe Maan2017-09-071-2/+0
| |\ \ \ \
| | * | | | Remove duplicate task gettext:po_to_jsonmk-remove-duplicate-taskMichael Kozono2017-09-061-2/+0
| | | |_|/ | | |/| |
| * | | | Merge branch '37023-remove-focus-styles-from-dropdown-empty-link' into 'master'Tim Zallmann2017-09-077-15/+28
| |\ \ \ \
| | * | | | Remove focus styles from dropdown empty link37023-remove-focus-styles-from-dropdown-empty-linkEric Eastwood2017-09-057-15/+28
| * | | | | Merge branch 'add_quick_submission_on_user_settings_page' into 'master'Tim Zallmann2017-09-072-1/+6
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add quick submission on user settings pageVitaliy @blackst0ne Klachkov2017-09-022-1/+6
| * | | | | Merge branch '37532-fix-broken-link-on-kubernetes-monitoring-page-docs' into ...Achilleas Pipinellis2017-09-061-1/+1
| |\ \ \ \ \
| | * | | | | Fix broken link on Kubernetes Monitoring page - docsJoshua Lambert2017-09-061-1/+1
| |/ / / / /
| * | | | | Merge branch 'jk-fix-migrate' into 'master'Robert Speicher2017-09-062-1/+1
| |\ \ \ \ \
| | * | | | | reset namespace columns in migrationjk-fix-migrateJarka Kadlecova2017-09-062-1/+1
| * | | | | | Merge branch 'patch-24' into 'master'Robert Speicher2017-09-061-1/+1
| |\ \ \ \ \ \
| | * | | | | | Update GITALY_SERVER_VERSION to 0.38.0Alejandro Rodríguez2017-09-061-1/+1
| * | | | | | | Merge branch '35811-fix-copy-link-text-color' into 'master'Tim Zallmann2017-09-061-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Prevent `btn-transparent` class from being added on `Copy link` actionkushalpandya2017-09-061-1/+1
| * | | | | | | | Merge branch 'winh-dropdown-changelog-docs' into 'master'Annabel Dunstone Gray2017-09-061-0/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add changelog entry for new dropdown stylesWinnie Hellmann2017-09-061-0/+5
| * | | | | | | | | Merge branch 'fix/sm/33281-activerecord-recordinvalid-when-build-has-nil-prot...Kamil Trzciński2017-09-063-2/+11
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix specShinya Maeda2017-09-071-1/+1
| | * | | | | | | | Remove only validationfix/sm/33281-activerecord-recordinvalid-when-build-has-nil-protectedShinya Maeda2017-09-072-2/+0
| | * | | | | | | | Revert set_protectedShinya Maeda2017-09-074-12/+12
| | * | | | | | | | Fix /models/ci/pipeline.rbShinya Maeda2017-09-061-1/+1
| | * | | | | | | | Use before_save :set_protectedShinya Maeda2017-09-065-12/+23
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'anakashima/gitlab-ce-fix_wiki_toc_indent' into 'master'Sean McGivern2017-09-063-18/+113
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Refactor table of contents buildingRobert Speicher2017-09-061-19/+11
| | * | | | | | | Space before closing braceRobert Speicher2017-09-061-2/+2
| | * | | | | | | Refactor `HeaderNode#find_parent`Robert Speicher2017-09-061-6/+7
| | * | | | | | | Refactor TableOfContentsFilter's nested table of contentsRobert Speicher2017-09-062-72/+98
| | * | | | | | | Fix indentation level in Wiki's TOC items to regard header levelAkihiro Nakashima2017-09-063-10/+86
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'37407-error-500-when-creating-a-project-createservice-returns-a-nil-objectRobert Speicher2017-09-066-44/+124
| |\ \ \ \ \ \ \
| | * | | | | | | Migrate creating/deleting a branch to Gitalyfeature/migrate-branch-operations-to-gitalyAhmad Sherif2017-09-066-44/+124
| * | | | | | | | Merge branch 'ie-sidebar-icon-size' into 'master'Annabel Dunstone Gray2017-09-061-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed sidebar icon size in ie11ie-sidebar-icon-sizePhil Hughes2017-09-061-0/+4
| * | | | | | | | | Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'...Douwe Maan2017-09-0625-80/+268
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-0627-94/+268
| | * | | | | | | | | Adds CommitDescriptionRendererTiago Botelho2017-09-062-0/+14
| * | | | | | | | | | Merge branch 'evn-clarify-times-in-pb' into 'master'Robert Speicher2017-09-061-8/+8
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Clarify documentation about performance barernstvn2017-09-061-8/+8