summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Copyedit `using_docker_build.md` and fix linksfix/docker-in-docker-ci-documentationAchilleas Pipinellis2016-04-281-13/+24
* Update using_docker_build.md, clarify the 'privileged' mode requirementTomasz Maczukin2016-04-251-16/+48
* Fix 8.7.1 CHANGELOGRémy Coutable2016-04-251-2/+0
* Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-04-253-4/+17
|\
| * Merge branch 'fix-project-hook-delete-permissions' into 'master' Rémy Coutable2016-04-253-4/+15
| |\
| | * Prevent users from deleting Webhooks via API they do not ownStan Hu2016-04-243-4/+15
* | | Merge branch '15470-fix-unknown-license-not-shown' into 'master' Rémy Coutable2016-04-255-48/+59
|\ \ \ | |/ / |/| |
| * | Fix license detection to detect all license files, not only known licensesRémy Coutable2016-04-255-48/+59
|/ /
* | Merge branch 'fix/hidden-build-validation-in-ci-yaml' into 'master' Rémy Coutable2016-04-253-64/+122
|\ \ | |/ |/|
| * Move CHANGELOG entry to 8.7.1fix/hidden-build-validation-in-ci-yamlTomasz Maczukin2016-04-221-1/+1
| * Fix some typosTomasz Maczukin2016-04-222-7/+7
| * Modify code formattingTomasz Maczukin2016-04-221-3/+1
| * Update CHANGELOGTomasz Maczukin2016-04-221-0/+1
| * Simplify the GitlabCiYamlProcessor#initial_parsing methodTomasz Maczukin2016-04-221-16/+11
| * Fix formattingTomasz Maczukin2016-04-221-3/+3
| * Add posibility to define a hidden job without 'script' in .gitlab-ci.ymlTomasz Maczukin2016-04-222-53/+117
* | Merge branch 'feature/snumb130/hide-future-blocks-on-graph' into 'master' Robert Speicher2016-04-244-3/+8
|\ \
| * | Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates.Luke Howell2016-04-244-3/+8
* | | Merge branch 'rs-todo-middle-click' into 'master' Jacob Schatz2016-04-241-1/+2
|\ \ \ | |/ / |/| |
| * | Allow middle-click on a Todo row to open in a new tabRobert Speicher2016-04-241-1/+2
|/ /
* | Merge branch 'add-tags-to-fetch' into 'master' Achilleas Pipinellis2016-04-231-1/+1
|\ \
| * | Add --tags to fetching gitlab-shell to ensure tags are downloadedStan Hu2016-04-221-1/+1
|/ /
* | Merge branch 'upgrade-sidekiq' into 'master' Robert Speicher2016-04-221-4/+3
|\ \
| * | Update Sidekiq and related gems (bundle update sidekiq)Stan Hu2016-04-191-4/+3
* | | Merge branch 'rs-update-binstubs' into 'master' Robert Speicher2016-04-226-10/+30
|\ \ \ | |_|/ |/| |
| * | Re-generate Spring binstubs for updated version of SpringRobert Speicher2016-04-226-10/+30
|/ /
* | Merge branch 'ha_docs' into 'master' Drew Blessing2016-04-221-1/+1
|\ \
| * | Fix linkDrew Blessing2016-04-221-1/+1
* | | Merge branch 'ha_docs' into 'master' Drew Blessing2016-04-227-0/+524
|\ \ \ | |/ /
| * | New HA docs [ci skip]Drew Blessing2016-04-227-0/+524
|/ /
* | Merge branch 'sidekiq_troubleshooting' into 'master' Drew Blessing2016-04-222-0/+163
|\ \
| * | Add Sidekiq troubleshooting docs [ci skip]Drew Blessing2016-04-222-0/+163
* | | Merge branch 'rs-todos-feature-spec' into 'master' Robert Speicher2016-04-221-18/+20
|\ \ \
| * | | Refactor Todos feature spec to be faster and less brittleRobert Speicher2016-04-221-18/+20
* | | | Merge branch '15513-fix-undefined-can-method' into 'master' Robert Speicher2016-04-223-2/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Use the `can?` helper instead of `current_user.can?`15513-fix-undefined-can-methodRémy Coutable2016-04-223-2/+25
* | | | Merge branch 'escape-label-title' into 'master' Jacob Schatz2016-04-221-1/+1
|\ \ \ \
| * | | | Escapes label title in filtersescape-label-titlePhil Hughes2016-04-221-1/+1
| |/ / /
* | | | Merge branch 'fix/cherry-pick-specs-location' into 'master' Robert Speicher2016-04-221-0/+0
|\ \ \ \
| * | | | Move cherry-pick feature specs to proper directoryfix/cherry-pick-specs-locationGrzegorz Bizon2016-04-221-0/+0
| |/ / /
* | | | Merge branch 'doc/gitlab-shell-tag' into 'master' Achilleas Pipinellis2016-04-221-1/+1
|\ \ \ \
| * | | | Bump gitlab-shell to 2.7.2Achilleas Pipinellis2016-04-221-1/+1
| |/ / /
* | | | Merge branch 'issue_3799' into 'master' Rémy Coutable2016-04-222-30/+27
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into issue_3799Alfredo Sumaran2016-04-2236-63/+253
| |\ \ \ \ | | |/ / /
| * | | | Add tests for filtering owned projectsissue_3799Alfredo Sumaran2016-04-222-30/+27
* | | | | Merge branch 'fix-issue-with-assignee-not-updating' into 'master' Dmitriy Zaporozhets2016-04-223-2/+23
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed issue with assignee object not being returnedPhil Hughes2016-04-223-2/+23
|/ / / /
* | | | Merge branch 'issue_3799' into 'master' Rémy Coutable2016-04-224-1/+43
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/master' into issue_3799Alfredo Sumaran2016-04-21309-1422/+4992
| |\ \ \
| * | | | Update CHANGELOGAlfredo Sumaran2016-04-211-0/+1