summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-0789-251/+1909
|\
| * Merge branch 'breadcrumbs-extra-btns-remove' into 'master'Filipa Lacerda2017-09-0725-101/+30
| |\
| | * fixed new issue button not being clicked in specbreadcrumbs-extra-btns-removePhil Hughes2017-09-071-1/+3
| | * fixed new milstone button not being visiblePhil Hughes2017-09-062-4/+2
| | * fixed breadcrumb containerPhil Hughes2017-09-061-1/+1
| | * spec fixesPhil Hughes2017-09-067-7/+7
| | * Moves the action buttons out of the breadcrumbsPhil Hughes2017-09-0618-92/+21
| * | Merge branch '37411-update-omniauth-google-oauth2' into 'master'Douwe Maan2017-09-072-4/+4
| |\ \
| | * | Update the omniauth-google-oauth2 gem to 0.5.237411-update-omniauth-google-oauth2Rémy Coutable2017-09-072-4/+4
| * | | Merge branch 'update-templates-for-10-0' into 'master'Kamil Trzciński2017-09-0714-22/+572
| |\ \ \
| | * | | Update templates for 10.0update-templates-for-10-0Alessio Caiazza2017-09-0714-22/+572
| * | | | Merge branch 'add-security-on-protected-branches' into 'master'Achilleas Pipinellis2017-09-073-0/+40
| |\ \ \ \
| | * | | | Add Security on protected branchesFabio Busatto2017-09-073-0/+40
| |/ / / /
| * | | | Merge branch 'wiki_api' into 'master'Grzegorz Bizon2017-09-078-0/+948
| |\ \ \ \
| | * | | | Add API support for wiki pagesblackst0ne2017-09-078-0/+948
| * | | | | Merge branch 'docs-37499-add-description-template-examples-to-the-docs' into ...Achilleas Pipinellis2017-09-072-0/+59
| |\ \ \ \ \
| | * | | | | Add full text example description templateMark Fletcher2017-09-061-0/+45
| | * | | | | Add link to GitLab project examples in Description Template documentationMark Fletcher2017-09-062-0/+14
| * | | | | | Merge branch 'rs-remove-usage-ping-pretty' into 'master'Sean McGivern2017-09-072-3/+2
| |\ \ \ \ \ \
| | * | | | | | Remove the `pretty` parameter for `usage_data`rs-remove-usage-ping-prettyRobert Speicher2017-09-062-3/+2
| * | | | | | | 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
* | | | | | | | | | | Fix ordering of columns on new tableZeger-Jan van de Weg2017-09-072-11/+6
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into zj/gitlab-ce-zj...Kamil Trzcinski2017-09-06222-1668/+5831
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | 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
View Lorry Controller Status