summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport select_helper from EEbackport_changes_from_eeValery Sizov2016-04-202-15/+12
* Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan2016-04-1926-80/+390
|\
| * Add support to cherry-pick any commitP.S.V.R2016-04-1826-80/+390
* | Merge branch 'mr-formatting' into 'master' Robert Speicher2016-04-1924-36/+37
|\ \
| * | format merge request references properlyBen Bodenmiller2016-04-1824-36/+37
* | | Merge branch '14566-confidential-issue-branches' into 'master' Robert Speicher2016-04-194-15/+50
|\ \ \
| * | | A new branch created for a confidential issue is named `<id>-confidential-iss...14566-confidential-issue-branchesTimothy Andrew2016-04-192-2/+2
| * | | Remove unused variable in `IssuesController`.Timothy Andrew2016-04-181-2/+0
| * | | Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-br...Timothy Andrew2016-04-15177-636/+3115
| |\ \ \
| * | | | Make a few style changes based on MR feedback.Timothy Andrew2016-04-151-2/+2
| * | | | Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-br...Timothy Andrew2016-04-1396-479/+3791
| |\ \ \ \
| * | | | | Update CHANGELOGTimothy Andrew2016-04-131-0/+1
| * | | | | Fix the rubocop check.Timothy Andrew2016-04-131-2/+3
| * | | | | Test the `Issue#to_branch_name` method.Timothy Andrew2016-04-121-2/+11
| * | | | | Augment the tests for `Issue#related_branches`Timothy Andrew2016-04-121-3/+19
| * | | | | Refactor `Issue#related_branches`Timothy Andrew2016-04-123-5/+13
| * | | | | Sanitize branch names for confidential issues.Timothy Andrew2016-04-121-1/+5
* | | | | | Merge branch 'toggle-points-per-packet' into 'master' Rémy Coutable2016-04-196-24/+40
|\ \ \ \ \ \
| * | | | | | Configuring of points per UDP packettoggle-points-per-packetYorick Peterse2016-04-196-24/+40
* | | | | | | Merge branch 'bump-version' into 'master' Yorick Peterse2016-04-192-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Bump version to 8.8.0-prebump-versionDmitriy Zaporozhets2016-04-192-1/+3
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-04-191-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'patch-1' into 'master' Hannes Rosenögger2016-04-191-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | "git lfs init" is deprecated, use "git lfs install" instead.Con Vissenberg2016-04-181-1/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Merge branch 'rs-issue-15126' into 'master' Douwe Maan2016-04-196-5/+35
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove additional misuse of `data-original-title` attributeRobert Speicher2016-04-183-3/+3
| * | | | | | | | Remove persistent XSS vulnerability in `commit_person_link` helperRobert Speicher2016-04-173-2/+32
* | | | | | | | | Merge branch 'profile-aside-toggle' into 'master' Jacob Schatz2016-04-191-2/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed aside toggle on profile pagesprofile-aside-togglePhil Hughes2016-04-181-2/+0
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status