summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable2016-05-041-18/+0
|\
| * Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_ta...Rémy Coutable2016-05-041-18/+0
* | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-043-2/+24
|\ \ | |/ |/|
| * API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-293-2/+24
* | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-022-6/+19
|\ \
| * \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-04-262-6/+19
| |\ \ | | |/ | |/|
| | * Merge branch '15579-filter-milestone-confidential-issues-api' into 'master' Robert Speicher2016-04-261-1/+9
| | |\
| | | * Filter confidential issues from milestones API if user does not have accessStan Hu2016-04-251-1/+9
| | * | Merge branch 'fix-private-snippet-api' into 'master' Robert Speicher2016-04-251-5/+10
| | |\ \
| | | * | Prevent private snippets in public/internal projects from being leaked via APIStan Hu2016-04-251-5/+10
| | | |/
* | | | Properly handle bigger filesZeger-Jan van de Weg2016-04-281-4/+9
* | | | Replace gitlab-workhorse with GitLab Workhorse where appropriateinitd_gitlab_workhorse_renameAchilleas Pipinellis2016-04-281-6/+6
* | | | Merge branch 'use-remote-ip-for-akismet' into 'master' Rémy Coutable2016-04-282-4/+12
|\ \ \ \
| * | | | Use ActionDispatch Remote IP for Akismet checkingStan Hu2016-04-272-4/+12
| |/ / /
* | | | Backport GitHub Enterprise import support from EEStan Hu2016-04-261-4/+11
|/ / /
* | | Merge branch 'emoji-unicode-fix' into 'master' Jacob Schatz2016-04-251-0/+4
|\ \ \
| * | | Removed usage of normilizeEmojiName methodemoji-unicode-fixPhil Hughes2016-04-221-2/+1
| * | | Fixes issue with emoji comments not showing correct emoji imagePhil Hughes2016-04-221-0/+5
* | | | Merge branch 'issue_14904' into 'master' Jacob Schatz2016-04-251-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-215-41/+40
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-203-1/+11
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2016-40/+289
| |\ \ \ \ \
| * | | | | | Add shortcut_path to GonHelper moduleAlfredo Sumaran2016-04-181-0/+1
* | | | | | | Merge branch 'rs-503-page' into 'master' Dmitriy Zaporozhets2016-04-252-2/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add a branded 503 static error pagers-503-pageRobert Speicher2016-04-222-2/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix-project-hook-delete-permissions' into 'master' Rémy Coutable2016-04-251-2/+2
|\ \ \ \ \ \
| * | | | | | Prevent users from deleting Webhooks via API they do not ownStan Hu2016-04-241-2/+2
| |/ / / / /
* | | | | | Fix some typosTomasz Maczukin2016-04-221-1/+1
* | | | | | Modify code formattingTomasz Maczukin2016-04-221-3/+1
* | | | | | Simplify the GitlabCiYamlProcessor#initial_parsing methodTomasz Maczukin2016-04-221-16/+11
* | | | | | Add posibility to define a hidden job without 'script' in .gitlab-ci.ymlTomasz Maczukin2016-04-221-4/+7
|/ / / / /
* | | | | Merge branch 'dev_issue_15331' into 'master' Robert Speicher2016-04-211-3/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix failing specAlfredo Sumaran2016-04-211-2/+1
| * | | | Add noreferrer value to rel attribute for external linksAlfredo Sumaran2016-04-201-1/+1
| | |_|/ | |/| |
* | | | Use SIGTERM during Sidekiq memory shutdownJacob Vosmaer2016-04-211-2/+2
* | | | Revert "Merge branch 'sentry-js' into 'master' "Jacob Schatz2016-04-211-1/+0
* | | | Merge branch 'fix/cross-project-labels-project-reference' into 'master' Grzegorz Bizon2016-04-211-15/+21
|\ \ \ \
| * | | | Refactor banzai code that finds cross-project labelsGrzegorz Bizon2016-04-211-15/+21
| * | | | Fix cross-project label ref with invalid projectGrzegorz Bizon2016-04-211-1/+1
| |/ / /
* | | | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-212-23/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-1912-48/+231
| |\ \ \
| * | | | Write specs for this featureKamil Trzcinski2016-04-161-6/+13
| * | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1628-176/+295
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1314-18/+142
| |\ \ \ \ \
| * | | | | | Fix create_next_builds methodKamil Trzcinski2016-04-121-19/+0
| * | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-113-18/+47
| |\ \ \ \ \ \
| * | | | | | | Fix specsKamil Trzcinski2016-04-111-4/+10
| * | | | | | | Use Ci::Commit as PipelineKamil Trzcinski2016-04-111-1/+1
* | | | | | | | Merge branch 'fix-grape-internal-allowed-action' into 'master' Robert Speicher2016-04-202-1/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix setting of "action" for Grape transactionsYorick Peterse2016-04-202-1/+10
| | |_|_|_|_|_|/ | |/| | | | | |