summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport search_helper changes from EEbackport_to_search_helper_from_eeValery Sizov2016-09-146-60/+66
* Merge branch 'gitlab_shell_350' into 'master' 21249-update-labels-sidebar-live-after-slash-command-existing-issue-mr-ajaxRémy Coutable2016-09-142-2/+2
|\
| * Update the 8.11 to 8.12 update documentation to use gitlab-shell 3.5.0Rémy Coutable2016-09-141-1/+1
| * Update GITLAB_SHELL_VERSIONDrew Blessing2016-09-141-1/+1
|/
* Merge branch 'fix/gitlab-popen-thread-safety' into 'master' Stan Hu2016-09-142-6/+7
|\
| * Fix Gitlab::Popen.popen thread-safety issuefix/gitlab-popen-thread-safetyAhmad Sherif2016-09-132-6/+7
* | Merge branch 'pushes-since-gc-redis' into 'master' 19600-artifacts-show-up-in-interface-as-expired-immediately-although-configured-as-1-month-or-4-weeksRobert Speicher2016-09-137-33/+99
|\ \
| * | Move pushes_since_gc to Redispushes-since-gc-redisYorick Peterse2016-09-137-33/+99
* | | Merge branch 'workhorse-secret-trailing-newline' into 'master' Stan Hu2016-09-132-1/+6
|\ \ \
| * | | Allow trailing newline in secret base64 dataJacob Vosmaer2016-09-132-1/+6
* | | | Merge branch 'rc-use-haml_lint' into 'master' Robert Speicher2016-09-135-0/+119
|\ \ \ \ | |_|_|/ |/| | |
| * | | Improve .haml-lint.yml, simplify the haml_lint task and remove CHANGELOG entryrc-use-haml_lintRémy Coutable2016-09-133-10/+2
| * | | Add haml_lint rake taskRémy Coutable2016-09-132-1/+9
| * | | Add .haml-lint.ymlRémy Coutable2016-09-131-0/+107
| * | | Use haml_lint for views lintingRémy Coutable2016-09-134-0/+12
* | | | Merge branch 'feature/builds-register-change-404-to-204' into 'master' Rémy Coutable2016-09-137-20/+68
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix a typo in documentationfeature/builds-register-change-404-to-204Tomasz Maczukin2016-09-131-1/+1
| * | | Add test with inactive error use case for 'POST /ci/api/v1/builds/register.json'Tomasz Maczukin2016-09-132-0/+14
| * | | Fix rubocop offencesTomasz Maczukin2016-09-131-1/+1
| * | | Update API documentationTomasz Maczukin2016-09-131-0/+9
| * | | Update CHANGELOGTomasz Maczukin2016-09-131-0/+1
| * | | Change response for /ci/api/v1/builds/register.json from 404 to 204Tomasz Maczukin2016-09-134-20/+44
* | | | Merge branch 'rs-ssh-key-title-populate' into 'master' Robert Speicher2016-09-133-0/+20
|\ \ \ \
| * | | | Restore SSH Key title auto-population behaviorRobert Speicher2016-09-133-0/+20
| |/ / /
* | | | Merge branch 'patch-4' into 'master' Robert Speicher2016-09-132-1/+2
|\ \ \ \
| * | | | update gitlab shell secret file also when it is emptyElan Ruusamäe2016-09-132-1/+2
| | |/ / | |/| |
* | | | Merge branch '20780-import-github-release-notes' into 'master' Robert Speicher2016-09-136-2/+120
|\ \ \ \ | |_|/ / |/| | |
| * | | Import GitHub release notesAndrew Smith2016-09-136-2/+120
| |/ /
* | | Merge branch '21636-deleting-source-project-with-existing-fork-closes-all-rel...Rémy Coutable2016-09-138-21/+127
|\ \ \ | |_|/ |/| |
| * | Change method name to #reopenable?Katarzyna Kobierska2016-09-133-12/+13
| * | Improve grammarKatarzyna Kobierska2016-09-132-2/+2
| * | Fix not working test with executeKatarzyna Kobierska2016-09-131-4/+4
| * | Add CHANGELOGKatarzyna Kobierska2016-09-131-0/+1
| * | Improve grammarKatarzyna Kobierska2016-09-132-2/+2
| * | Add #can_reopen? and testsKatarzyna Kobierska2016-09-134-24/+48
| * | Add methodKatarzyna Kobierska2016-09-132-0/+20
| * | Add test checking method closed_without_source_projectKatarzyna Kobierska2016-09-132-6/+38
| * | Add #closed_without_source_project?Katarzyna Kobierska2016-09-134-19/+26
| * | Checks if deleting forked project closed all open merge requestsKatarzyna Kobierska2016-09-133-6/+8
| * | Before deleting project if forked unlink forkKatarzyna Kobierska2016-09-132-0/+19
|/ /
* | Merge branch '22053-gitlab-checks-metrics' into 'master' Yorick Peterse2016-09-132-1/+3
|\ \
| * | Gitlab::Checks is now instrumentedPaco Guzman2016-09-132-1/+3
* | | Merge branch 'avoid-loading-protected-branches-on-change-access-checks' into ...Yorick Peterse2016-09-132-0/+2
|\ \ \
| * | | Avoid protected branches checks when verifying access without branch namePaco Guzman2016-09-132-0/+2
| |/ /
* | | Merge branch '21895-horizontal-scroll-bar-present-in-collapsed-sidebar' into ...Annabel Dunstone Gray2016-09-131-1/+1
|\ \ \
| * | | Removed horizontal overflow from collapsed issuable sidebar21895-horizontal-scroll-bar-present-in-collapsed-sidebarLuke Bennett2016-09-121-1/+1
* | | | Merge branch '21877-no-mr-branch-title-link-in-issue-on-mobile' into 'master' Annabel Dunstone Gray2016-09-134-6/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | Used flexbox to force related merge request list items into columned items21877-no-mr-branch-title-link-in-issue-on-mobileLuke Bennett2016-09-093-2/+11
| * | | Removed media query declaration relating to merge-request-info and issue-infoLuke Bennett2016-09-071-4/+0
* | | | Merge branch 'fix-commit-status' into 'master' Rémy Coutable2016-09-133-36/+58
|\ \ \ \
View Lorry Controller Status