summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use entity request object in environment entityGrzegorz Bizon2016-11-024-18/+22
* Add PoC for resource serializersGrzegorz Bizon2016-11-028-0/+140
* Merge branch 'gpocentek/gitlab-ce-api-webhook-token' into 'master' Rémy Coutable2016-11-024-2/+39
|\
| * Ensure hook tokens are write-only in the APIgpocentek/gitlab-ce-api-webhook-tokenSean McGivern2016-11-013-7/+35
| * Add support for token attr in project hooks APIGauvain Pocentek2016-11-015-3/+12
* | Merge branch 'slony-upgrade-guide' into 'master' Achilleas Pipinellis2016-11-023-0/+485
|\ \
| * | Added guide for upgrading Postgres using Slonyslony-upgrade-guideYorick Peterse2016-11-013-0/+485
* | | Merge branch '23713-milestone-dropdown-not-selected' into 'master' Robert Speicher2016-11-023-3/+9
|\ \ \
| * | | fixes milestone dropdown not select issue23713-milestone-dropdown-not-selectedNur Rony2016-11-013-3/+9
* | | | Merge branch 'create_hooks_rake' into 'master' Rémy Coutable2016-11-029-191/+327
|\ \ \ \
| * | | | Add Rake task to create/repair GitLab Shell hooks symlinksDrew Blessing2016-11-019-191/+327
* | | | | Merge branch 'allow-owner-to-run-ci-builds' into 'master' Rémy Coutable2016-11-025-9/+65
|\ \ \ \ \
| * | | | | Allow owners to fetch source code in CI buildsallow-owner-to-run-ci-buildsKamil Trzcinski2016-11-015-9/+65
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-changelog-md' into 'master' Alfredo Sumaran2016-11-021-46/+0
|\ \ \ \ \
| * | | | | Remove invalid changelog entriesAlfredo Sumaran2016-11-021-46/+0
|/ / / / /
* | | | | Merge branch '23053-ci-tables-pagination' into 'master' Alfredo Sumaran2016-11-024-3/+66
|\ \ \ \ \
| * | | | | Adds variable.23053-ci-tables-paginationFilipa Lacerda2016-11-012-35/+2
| * | | | | Fixes after reviewFilipa Lacerda2016-11-011-2/+21
| * | | | | Makes table pagination responsiveFilipa Lacerda2016-11-014-3/+80
* | | | | | Merge branch '23273-retry-build-btn' into 'master' Alfredo Sumaran2016-11-025-18/+44
|\ \ \ \ \ \
| * | | | | | Change retry button color23273-retry-build-btnAnnabel Dunstone Gray2016-10-282-2/+6
| * | | | | | Fix failing builds_specAnnabel Dunstone Gray2016-10-271-1/+3
| * | | | | | Rename retry link and update changelogAnnabel Dunstone Gray2016-10-263-2/+3
| * | | | | | Align header items; put retry button back in sidebar on mobileAnnabel Dunstone Gray2016-10-263-17/+44
| * | | | | | Add retry build button in page header, remove from sidebarAnnabel Dunstone Gray2016-10-263-10/+2
* | | | | | | Merge branch '23545-distorted-images' into 'master' Annabel Dunstone Gray2016-11-0115-43/+77
|\ \ \ \ \ \ \
| * | | | | | | Fix haml_lint23545-distorted-imagesAnnabel Dunstone Gray2016-11-011-2/+2
| * | | | | | | 23545 Fix distorted project and group avatarstauriedavis2016-11-0115-43/+77
* | | | | | | | require rails/generators for generatorsYorick Peterse2016-11-011-0/+2
* | | | | | | | Merge branch '21633-permalink-to-collapsed-diff-line-does-not-work' into 'mas...Fatih Acet2016-11-012-9/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Added forceLoad ability to singleFileDiffs, added callback to getContentHTML,...21633-permalink-to-collapsed-diff-line-does-not-workLuke Bennett2016-10-212-9/+28
* | | | | | | | | Merge branch '22889-remove-links-from-sidebar' into 'master' Fatih Acet2016-11-019-105/+106
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update changelog22889-remove-links-from-sidebarAnnabel Dunstone Gray2016-11-011-0/+1
| * | | | | | | | | Fix spinach testsAnnabel Dunstone Gray2016-11-013-13/+8
| * | | | | | | | | Update links in side nav and headerAnnabel Dunstone Gray2016-11-015-92/+97
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'background-migrations' into 'master'Robert Speicher2016-11-017-0/+168
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Support for post deployment migrationsbackground-migrationsYorick Peterse2016-10-317-0/+124
* | | | | | | | | Merge branch 'issue-boards-list-desciption-tooltip' into 'master' Fatih Acet2016-11-014-3/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds label description to issue board titleissue-boards-list-desciption-tooltipPhil Hughes2016-11-014-3/+12
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'project-activity-tabs-hide' into 'master' Fatih Acet2016-11-014-3/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Correctly passes feature key into feature_available methodproject-activity-tabs-hidePhil Hughes2016-11-012-36/+3
| * | | | | | | | | Removed return statement that isn't neededPhil Hughes2016-11-011-1/+1
| * | | | | | | | | Hide project activity tabs when features are disabledPhil Hughes2016-11-014-3/+64
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch '23641-remove-header-tooltips' into 'master' Fatih Acet2016-11-013-5/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove tooltips from project header23641-remove-header-tooltipsAnnabel Dunstone Gray2016-11-013-5/+3
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'patch-7' into 'master' Patricio Cano2016-11-011-7/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix how to get SAML error detailsBen Bodenmiller2016-10-311-7/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-init-sidekiq-queues' into 'master' Yorick Peterse2016-11-012-0/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Initialize Sidekiq with the list of queues used by GitLabsh-init-sidekiq-queuesStan Hu2016-11-012-0/+17
* | | | | | | | | | Merge branch '22448-fix-500-nonexisting-branch' into 'master' Sean McGivern2016-11-014-16/+92
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |