summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/project-export-ui-experimental' into 'feature/project-i...feature/project-importDouwe Maan2016-06-1745-218/+503
|\
| * a few changes based on MR feedbackJames Lopez2016-06-176-10/+17
| * fixed changelog - [ci skip]feature/project-export-ui-experimentalJames Lopez2016-06-161-9/+0
| * fixed merge conflicts on UI branchJames Lopez2016-06-16405-3053/+16766
| |\ | |/ |/|
* | fixed merge conflictsJames Lopez2016-06-16405-3056/+16760
|\ \
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-16405-3056/+16760
| |\ \
| | * \ Merge branch '18591-banzai-filter-upload-link-filter' into 'master' Yorick Peterse2016-06-163-10/+22
| | |\ \
| | | * | Banzai::Filter::UploadLinkFilter use XPathPaco Guzman2016-06-163-10/+22
| | * | | Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master' Douwe Maan2016-06-165-26/+5
| | |\ \ \
| | | * | | Fix permission checks in member rowbackport-view-condition-improvement-from-ee-460Rémy Coutable2016-06-153-24/+3
| | | * | | Fix wrong partial path in JS viewRémy Coutable2016-06-152-2/+2
| | * | | | Merge branch 'group-owners-association' into 'master' Rémy Coutable2016-06-162-4/+18
| | |\ \ \ \
| | | * | | | Turn Group#owners into a has_many associationYorick Peterse2016-06-162-4/+18
| | * | | | | Merge branch 'fix-environments-db' into 'master' Valery Sizov2016-06-162-1/+22
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Make project_id nullableKamil Trzcinski2016-06-162-1/+22
| | |/ / / /
| | * | | | Merge branch 'fix_migration_style_guide' into 'master' Yorick Peterse2016-06-161-2/+14
| | |\ \ \ \
| | | * | | | Update migration_style_guide.md with new detailsfix_migration_style_guideDrew Blessing2016-06-151-2/+14
| | * | | | | Merge branch 'hide-todo-collapsed-sidebar' into 'master' Jacob Schatz2016-06-161-0/+5
| | |\ \ \ \ \
| | | * | | | | Hide the Todo button in the collapsed issuable sidebar.hide-todo-collapsed-sidebarConnor Shea2016-06-151-0/+5
| | * | | | | | Merge branch 'long-commit-message-scroll-fix' into 'master' Jacob Schatz2016-06-162-0/+2
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into long-commit-mes...Fatih Acet2016-06-16353-2724/+15578
| | | |\ \ \ \ \ \
| | | * | | | | | | Update CHANGELOG.long-commit-message-scroll-fixFatih Acet2016-06-141-0/+1
| | | * | | | | | | Fix long commit message scroll issue.Fatih Acet2016-06-141-0/+1
| | * | | | | | | | Merge branch 'category-search-dropdown' into 'master' Jacob Schatz2016-06-1610-22/+354
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search...Fatih Acet2016-06-16367-2845/+15729
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'toggle-whitespace-button-for-compare-page' into 'master' Jacob Schatz2016-06-153-0/+8
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | added whitespace toggle to diffs page and set it to return the project compar...Luke "Jared" Bennett2016-06-103-0/+8
| | * | | | | | | | | Merge branch 'award-emoji-fix' into 'master' Jacob Schatz2016-06-151-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix emoji block selector.award-emoji-fixFatih Acet2016-06-111-1/+1
| | * | | | | | | | | | Merge branch 'update-changelog' into 'master' Robert Speicher2016-06-151-0/+24
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Update CHANGELOG for 8.7.7 releaseDouglas Barbosa Alexandre2016-06-151-0/+3
| | | * | | | | | | | | | Update CHANGELOG for 8.6.9 releaseDouglas Barbosa Alexandre2016-06-151-0/+5
| | | * | | | | | | | | | Update CHANGELOG for 8.5.13 releaseDouglas Barbosa Alexandre2016-06-151-0/+4
| | | * | | | | | | | | | Update CHANGELOG for 8.4.11 releaseDouglas Barbosa Alexandre2016-06-151-0/+4
| | | * | | | | | | | | | Update CHANGELOG for 8.3.10 releaseDouglas Barbosa Alexandre2016-06-151-0/+4
| | | * | | | | | | | | | Update CHANGELOG for 8.2.6 release8-2-6-changelog-entriesDouglas Barbosa Alexandre2016-06-151-0/+4
| | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'revert-b4e8d59b' into 'master' Jacob Schatz2016-06-151-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Revert "Merge branch '18047-event-item-links-dont-look-like-links' into 'mast...revert-b4e8d59bJacob Schatz2016-06-151-1/+1
| | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'network-assets' into 'master' Jacob Schatz2016-06-159-17/+8262
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix failing test.Connor Shea2016-06-101-1/+1
| | | * | | | | | | | | Replace raphael-rails with raphael.js so it can be split from the rest of the...Connor Shea2016-06-109-17/+8262
| | | |/ / / / / / / /
| | * | | | | | | | | Merge branch '18047-event-item-links-dont-look-like-links' into 'master' Jacob Schatz2016-06-151-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Updated '.event-item a' colorLuke "Jared" Bennett2016-06-101-1/+1
| | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch '18301-top-navigation-needs-hover-state' into 'master' Jacob Schatz2016-06-151-0/+6
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | added hover state to top nav linksLuke "Jared" Bennett2016-06-101-0/+6
| | | |/ / / / / / / /
| | * | | | | | | | | Merge branch 'milestone-date-clear' into 'master' Jacob Schatz2016-06-154-7/+20
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Changed how date gets clearedmilestone-date-clearPhil Hughes2016-06-101-2/+1
| | | * | | | | | | | | Fixed testsPhil Hughes2016-06-101-6/+8
| | | * | | | | | | | | Due date can be removed from milestonesPhil Hughes2016-06-104-7/+19
| | * | | | | | | | | | Merge branch 'add-shortcut-to-copy-file-content-hash-link' into 'master' Jacob Schatz2016-06-154-2/+14
| | |\ \ \ \ \ \ \ \ \ \