summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed issue with sidebar edit links toggling anchoredit-link-anchor-stopPhil Hughes2016-04-191-15/+24
* Merge branch 'dropdown-filter-after-load' into 'master' Jacob Schatz2016-04-192-0/+4
|\
| * Trigger filtering after ajax is complete in dropdowndropdown-filter-after-loadPhil Hughes2016-04-192-0/+4
* | Merge branch 'api-fix-annotated-tags' into 'master' Rémy Coutable2016-04-193-1/+4
|\ \
| * | Ensure that annoation is presented properlyRobert Schilling2016-04-181-0/+2
| * | API: Present an array of Gitlab::Git::Tag instead of array of rugged tagsRobert Schilling2016-04-172-1/+2
* | | Merge branch 'docs/notice-about-gitlab-runner' into 'master' Grzegorz Bizon2016-04-192-1/+25
|\ \ \
| * | | Add a note about installing Runners in ci/runners/README.mddocs/notice-about-gitlab-runnerAchilleas Pipinellis2016-04-111-1/+5
| * | | Add link to Runner security docAchilleas Pipinellis2016-04-111-4/+14
| * | | Add notice about GitLab Runner to requirements docsGrzegorz Bizon2016-04-041-0/+10
* | | | Merge branch 'configurable-shared-runners-text' into 'master' Kamil Trzciński2016-04-198-4/+39
|\ \ \ \
| * | | | Use different markdownconfigurable-shared-runners-textKamil Trzcinski2016-04-192-3/+4
| * | | | Fix CHANGELOGKamil Trzcinski2016-04-181-1/+0
| * | | | Update according to review commentsKamil Trzcinski2016-04-182-6/+5
| * | | | Add configurable shared runners textKamil Trzcinski2016-04-188-4/+40
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqGrzegorz Bizon2016-04-193-4/+59
|\ \ \ \ \
| * \ \ \ \ Merge branch 'fix/link-group-permissions' into 'master' Douwe Maan2016-04-193-4/+59
| |\ \ \ \ \
| | * | | | | Add Changelog entry for group link permissions fixGrzegorz Bizon2016-04-191-0/+3
| | * | | | | Use guard clause to check ability to share projectGrzegorz Bizon2016-04-191-7/+4
| | * | | | | Refactor method that shares project with a groupGrzegorz Bizon2016-04-191-4/+3
| | * | | | | Check permissions when sharing project with groupGrzegorz Bizon2016-04-192-4/+60
* | | | | | | Merge branch 'make-before-after-overridable' into 'master' Kamil Trzciński2016-04-194-18/+109
|\ \ \ \ \ \ \
| * | | | | | | Make rubocop happymake-before-after-overridableKamil Trzcinski2016-04-182-20/+23
| * | | | | | | Trigger buildsKamil Trzcinski2016-04-180-0/+0
| * | | | | | | Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-181-15/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-1858-360/+960
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-183-29/+38
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update CHANGELOG and add documentationKamil Trzcinski2016-04-172-0/+21
| * | | | | | | | | | Merge branch 'after-script' into make-before-after-overridableKamil Trzcinski2016-04-174-23/+34
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow the before_script and finally_script to be overwritten in context of jobKamil Trzcinski2016-04-162-14/+81
* | | | | | | | | | | | Merge branch 'after-script' into 'master' Kamil Trzciński2016-04-194-18/+73
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | / / / / / / | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Resolve mergeafter-scriptKamil Trzcinski2016-04-181-15/+0
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-1827-114/+363
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into after-scriptKamil Trzcinski2016-04-1832-246/+597
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Fix rubocop complainsKamil Trzcinski2016-04-182-29/+35
| * | | | | | | | | Add note about versionKamil Trzcinski2016-04-171-0/+3
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Add CHANGELOG and documentationKamil Trzcinski2016-04-172-0/+11
| * | | | | | | | Rename finally_script to after_scriptKamil Trzcinski2016-04-172-13/+13
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Implement finally_script which allows to do cleanups as part of the build pro...Kamil Trzcinski2016-04-162-2/+37
* | | | | | | | Merge branch 'dz/system-hooks-ui' into 'master' Dmitriy Zaporozhets2016-04-194-13/+37
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add push events to permit params in system hooksdz/system-hooks-uiDmitriy Zaporozhets2016-04-191-1/+1
| * | | | | | | Allow enable/disable push events for system hooksDmitriy Zaporozhets2016-04-193-12/+36
* | | | | | | | Merge branch 'fix/prepare-build-in-docker' into 'master' Douwe Maan2016-04-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix prepare build execution in docker environmentTomasz Maczukin2016-04-191-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'feature/system_hook_push' into 'master' Dmitriy Zaporozhets2016-04-1915-49/+209
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add CHANGELOG itemfeature/system_hook_pushDmitriy Zaporozhets2016-04-191-0/+2
| * | | | | | | moving overlapping scopes to webhookGabriel Mazetto2016-04-193-5/+3
| * | | | | | | Using single builder for push and tag eventsGabriel Mazetto2016-04-195-46/+47
| * | | | | | | Refactor GitTagPushService and fig tags_push system event hookGabriel Mazetto2016-04-193-28/+27
| * | | | | | | Added System Hooks for push and tag_pushGabriel Mazetto2016-04-1910-21/+181
| | |_|_|_|_|/ | |/| | | | |