| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'revert-6455-and-4960' into 'master'
| Douwe Maan | 2016-09-22 | 10 | -94/+23 |
|\ |
|
| * | Revert part of "Merge branch 'update_issues_mr_counter' into 'master' | Rémy Coutable | 2016-09-22 | 9 | -72/+18 |
| * | Revert "Merge branch '22421-fix-issuable-counter-when-more-than-one-label-is-... | Rémy Coutable | 2016-09-22 | 2 | -26/+9 |
* | | Merge branch 'ci-permissions-documentation' into 'master'
| Achilleas Pipinellis | 2016-09-22 | 4 | -0/+325 |
|\ \ |
|
| * | | Copyedit the CI build permissions doc | Achilleas Pipinellis | 2016-09-22 | 1 | -3/+3 |
| * | | Small fixes in CI build permissions docs | Achilleas Pipinellis | 2016-09-22 | 2 | -17/+17 |
| * | | s/project/build | Achilleas Pipinellis | 2016-09-22 | 1 | -1/+1 |
| * | | Added a note about build triggers [ci skip] | Kamil Trzcinski | 2016-09-22 | 2 | -0/+12 |
| * | | Make 'build permissions' consistent | Achilleas Pipinellis | 2016-09-22 | 2 | -3/+3 |
| * | | Add a small description mentioning submodules/LFS | Achilleas Pipinellis | 2016-09-22 | 1 | -2/+1 |
| * | | Move document on CI build permissions to new location | Achilleas Pipinellis | 2016-09-22 | 3 | -16/+16 |
| * | | Refactor new CI build permissions model docs | Achilleas Pipinellis | 2016-09-22 | 2 | -158/+211 |
| * | | Update permissions table | Kamil Trzcinski | 2016-09-22 | 1 | -6/+23 |
| * | | Describe how the recent changes of CI permissions affect builds | Kamil Trzcinski | 2016-09-22 | 3 | -0/+244 |
| |/ |
|
* | | Merge branch 'fix-mr-version-dropdowns' into 'master'
| Fatih Acet | 2016-09-22 | 1 | -34/+38 |
|\ \ |
|
| * | | fix dropdowns for mr-versionsfix-mr-version-dropdowns | tauriedavis | 2016-09-22 | 1 | -34/+38 |
* | | | Merge branch 'search-field-ignores' into 'master'
| Rémy Coutable | 2016-09-22 | 2 | -17/+25 |
|\ \ \ |
|
| * | | | Intercept issues search form submit to preserve filters.search-field-ignores | Bryce | 2016-09-22 | 2 | -17/+25 |
* | | | | Merge branch 'hotfix-gl-dropdown-field-undefined' into 'master'
| Rémy Coutable | 2016-09-22 | 1 | -12/+13 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Added checks for field before field.length and removed unneeded fieldNamehotfix-gl-dropdown-field-undefined | Luke Bennett | 2016-09-20 | 1 | -12/+13 |
* | | | | Merge branch '22417-api-fork-fix' into 'master'
| Rémy Coutable | 2016-09-22 | 2 | -3/+5 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | API: Return 404 when trying to fork to unaccessible namespace | Rémy Coutable | 2016-09-22 | 2 | -3/+5 |
* | | | | Merge branch 'fix-pipeline-for-empty-merge-request-diff' into 'master'
| Rémy Coutable | 2016-09-22 | 3 | -7/+48 |
|\ \ \ \ |
|
| * | | | | Add test for MergeRequestDiff#commits_sha, feedback: | Lin Jen-Shin | 2016-09-22 | 1 | -0/+22 |
| * | | | | So that st_commits could never be nil | Lin Jen-Shin | 2016-09-22 | 1 | -4/+6 |
| * | | | | For empty merge_request_diff st_commits would be nilfix-pipeline-for-empty-merge-request-diff | Lin Jen-Shin | 2016-09-22 | 2 | -7/+24 |
* | | | | | Merge branch 'bpj-merge-request-diff-fixes' into 'master'
| Rémy Coutable | 2016-09-22 | 3 | -9/+6 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Stop disabling jump_to_next buttons, when not on latest MR diff.bpj-merge-request-diff-fixes | Bryce Johnson | 2016-09-22 | 1 | -3/+1 |
| * | | | | Remove colons in dropdowns, use icon helper, and fix 'Show original' link. | Bryce Johnson | 2016-09-22 | 2 | -6/+5 |
| | |_|/
| |/| | |
|
* | | | | Merge branch 'dz-improve-mr-versions-doc' into 'master'
| Rémy Coutable | 2016-09-22 | 4 | -1/+5 |
|\ \ \ \ |
|
| * | | | | Update merge request versions documentation with new screenshotsdz-improve-mr-versions-doc | Dmitriy Zaporozhets | 2016-09-21 | 4 | -1/+5 |
* | | | | | Merge branch '22421-fix-issuable-counter-when-more-than-one-label-is-selected... | Rémy Coutable | 2016-09-22 | 2 | -9/+26 |
|\ \ \ \ \ |
|
| * | | | | | Hotfix the issuable counters when filtering by multiple labels22421-fix-issuable-counter-when-more-than-one-label-is-selected | Rémy Coutable | 2016-09-22 | 2 | -9/+26 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge branch 'update-db-schema' into 'master'
| Rémy Coutable | 2016-09-22 | 1 | -4/+5 |
|\ \ \ \ \ |
|
| * | | | | | Update db/schema.rb per most recent migrationsupdate-db-schema | Yorick Peterse | 2016-09-21 | 1 | -4/+5 |
* | | | | | | Merge branch 'sh-bump-gitlab-shell-8.12' into 'master'
| Achilleas Pipinellis | 2016-09-22 | 1 | -1/+1 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Bump gitlab-shell upgrade version to 3.6.0 for 8.12sh-bump-gitlab-shell-8.12 | Stan Hu | 2016-09-22 | 1 | -1/+1 |
|/ / / / / |
|
* | | | | | Merge branch 'docs/cycle-analytics' into 'master'
merge-request-push-compare-ui | Achilleas Pipinellis | 2016-09-22 | 1 | -6/+8 |
|\ \ \ \ \ |
|
| * | | | | | Fix typos in cycle analytics docs | Achilleas Pipinellis | 2016-09-22 | 1 | -6/+8 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge branch 'docs/issue-closing-pattern' into 'master'
| Achilleas Pipinellis | 2016-09-22 | 8 | -44/+114 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | Change location and refactor issue closing pattern documentation | Achilleas Pipinellis | 2016-09-22 | 8 | -44/+114 |
| |/ / / |
|
* | | | | Revert "Merge branch '22364-rails-cache-redis-connection-pool' into 'master'" | Rubén Dávila Santos | 2016-09-22 | 2 | -5/+0 |
* | | | | Merge branch 'reorganize_sections_in_admin_settings' into 'master'
| Achilleas Pipinellis | 2016-09-21 | 1 | -22/+32 |
|\ \ \ \ |
|
| * | | | | Reorganize sections in Admin area settingsreorganize_sections_in_admin_settings | Achilleas Pipinellis | 2016-09-21 | 1 | -22/+32 |
| |/ / / |
|
* | | | | fix import/export security specs after merge | James Lopez | 2016-09-21 | 3 | -1/+15 |
| |/ /
|/| | |
|
* | | | Merge branch 'zj-default-setting-features' into 'master'
| Robert Speicher | 2016-09-21 | 1 | -0/+6 |
|\ \ \ |
|
| * | | | Remove duplicate default_value_level entryzj-default-setting-features | Zeger-Jan van de Weg | 2016-09-21 | 1 | -1/+0 |
| * | | | Add default values for ProjectFeature | Z.J. van de Weg | 2016-09-21 | 1 | -0/+7 |
| |/ / |
|
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Rémy Coutable | 2016-09-21 | 3 | -2/+23 |
|\ \ \ |
|
| * \ \ | Merge branch 'fix/import-security-specs' into 'master'
| Rémy Coutable | 2016-09-21 | 3 | -2/+23 |
| |\ \ \ |
|