summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-09-141-0/+12
|\
| * Handle encoding in non-binary Blob instancesupdate-gitlab-gitYorick Peterse2016-09-141-0/+12
* | Backport search_helper changes from EEbackport_to_search_helper_from_eeValery Sizov2016-09-144-34/+34
* | 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-132-9/+19
|\ \
| * | Move pushes_since_gc to Redispushes-since-gc-redisYorick Peterse2016-09-132-9/+19
| |/
* | Restore SSH Key title auto-population behaviorRobert Speicher2016-09-131-0/+1
* | Change method name to #reopenable?Katarzyna Kobierska2016-09-132-3/+4
* | Improve grammarKatarzyna Kobierska2016-09-131-1/+1
* | Add #can_reopen? and testsKatarzyna Kobierska2016-09-133-5/+3
* | Add methodKatarzyna Kobierska2016-09-131-0/+7
* | Add test checking method closed_without_source_projectKatarzyna Kobierska2016-09-131-6/+0
* | Add #closed_without_source_project?Katarzyna Kobierska2016-09-133-16/+23
* | Checks if deleting forked project closed all open merge requestsKatarzyna Kobierska2016-09-132-3/+3
* | Before deleting project if forked unlink forkKatarzyna Kobierska2016-09-131-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
* | | Remove unnecessary variablesKatarzyna Kobierska2016-09-132-8/+8
* | | Code refactoringKatarzyna Kobierska2016-09-133-11/+14
* | | Improve build_path name and admin variableKatarzyna Kobierska2016-09-135-14/+13
* | | Fix error in pathsKatarzyna Kobierska2016-09-131-6/+5
* | | Build path with callKatarzyna Kobierska2016-09-134-30/+6
* | | Create shared partial for project and admin buildsKatarzyna Kobierska2016-09-136-93/+46
* | | Moved build tabs partial to sharedKatarzyna Kobierska2016-09-133-2/+2
* | | Improve table code and add CHANGELOGKatarzyna Kobierska2016-09-131-4/+2
* | | Improve code in table partialKatarzyna Kobierska2016-09-131-3/+4
* | | Improve codeKatarzyna Kobierska2016-09-135-10/+11
* | | Liken admin and project builds views to each otherKatarzyna Kobierska2016-09-133-43/+31
* | | Move builds content list to partialKatarzyna Kobierska2016-09-133-40/+45
* | | Use local variables in partialKatarzyna Kobierska2016-09-133-10/+10
* | | Change the way paths are generatedKatarzyna Kobierska2016-09-135-15/+9
* | | Add partial to admin builds and project buildsKatarzyna Kobierska2016-09-135-44/+34
* | | Merge branch 'rails-5-backports' into 'master' Robert Speicher2016-09-121-1/+1
|\ \ \
| * | | Fix two problematic bits of code that will be deprecated or broken in Rails 5.Connor Shea2016-09-051-1/+1
* | | | Merge branch '21092-file-execution-flag-is-not-preserved-when-editing-files' ...Rémy Coutable2016-09-123-9/+6
|\ \ \ \
| * | | | Simplify a condition in Repository#update_fileRémy Coutable2016-09-121-1/+1
| * | | | fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-filestiagonbotelho2016-09-093-9/+6
* | | | | Merge branch 'issue_21825' into 'master' Rémy Coutable2016-09-121-0/+11
|\ \ \ \ \
| * | | | | Add information about user and manual build start to runner as variablesSergey Gnuskov2016-09-091-0/+11
* | | | | | Merge branch 'slightly-more-readable' into 'master' Rémy Coutable2016-09-121-3/+3
|\ \ \ \ \ \
| * | | | | | Make the cases clear instead of having guardsslightly-more-readableLin Jen-Shin2016-09-121-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'sh-defer-resolvable-check' into 'master' Yorick Peterse2016-09-121-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Only check :can_resolve permission if the note is resolvablesh-defer-resolvable-checkStan Hu2016-09-121-1/+2
| | |/ / / | |/| | |
* | | | | Merge branch '21814-fix' into 'master' Robert Speicher2016-09-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Pull import sources from Gitlab::ImportSourcesOjas Shirekar2016-09-091-1/+1
* | | | | Merge branch 'enable-pipeline-events-by-default' into 'master' Robert Speicher2016-09-091-0/+1
|\ \ \ \ \
| * | | | | Enable pipeline events by defaultenable-pipeline-events-by-defaultLin Jen-Shin2016-09-091-0/+1
| |/ / / /
* | | | | Merge branch 'add-remember-option-u2f' into 'master' Robert Speicher2016-09-093-2/+4
|\ \ \ \ \