summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Start of MR confict resolver serviceresolver-serviceJosh Frye2016-07-144-3/+91
* Merge branch 'issuable-author-tooltip' into 'master' Fatih Acet2016-07-142-3/+4
|\
| * Fixed Rubocopissuable-author-tooltipPhil Hughes2016-07-131-2/+1
| * Added author username tooltip in issuable headerPhil Hughes2016-07-122-3/+5
* | Merge branch 'dz-nicer-sidebar' into 'master' Dmitriy Zaporozhets2016-07-143-7/+4
|\ \
| * | Improves left static sidebar behaviourDmitriy Zaporozhets2016-07-143-7/+4
* | | Merge branch 'fix-duplicate-changelog-entry' into 'master' Robert Schilling2016-07-141-3/+0
|\ \ \ | |/ / |/| |
| * | Fix duplicated entry in changelog [ci skip]Robert Schilling2016-07-141-3/+0
|/ /
* | Merge branch 'rs-delimit-in-ui-guide' into 'master' Dmitriy Zaporozhets2016-07-141-21/+27
|\ \
| * | Add a UI guide note about number_with_delimiterrs-delimit-in-ui-guideRobert Speicher2016-07-121-21/+27
* | | Merge branch 'mrchrisw/oauth-callback' into 'master' Achilleas Pipinellis2016-07-141-1/+2
|\ \ \
| * | | Include default callback URL (OAuth)Chris Wilson2016-07-141-1/+2
|/ / /
* | | Merge branch 'fix-label-reference-filter' into 'master' Robert Speicher2016-07-133-14/+106
|\ \ \
| * | | Simplify regex for string-based multi-word label surrounded in quotesfix-label-reference-filterDouglas Barbosa Alexandre2016-07-131-1/+1
| * | | Update CHANGELOGDouglas Barbosa Alexandre2016-07-131-0/+1
| * | | Doesn't match empty label references surrounded in quotesDouglas Barbosa Alexandre2016-07-131-1/+1
| * | | Fix markdown rendering for label references that contains `.`Douglas Barbosa Alexandre2016-07-132-15/+15
| * | | Fix markdown rendering for label references that begin with a digitDouglas Barbosa Alexandre2016-07-132-1/+52
| * | | Fix markdown rendering for consecutive label referencesDouglas Barbosa Alexandre2016-07-132-1/+41
* | | | Merge branch 'rails-4-2-7' into 'master' Robert Speicher2016-07-133-32/+33
|\ \ \ \
| * | | | Upgrade Rails from 4.2.6 to 4.2.7.Connor Shea2016-07-133-32/+33
* | | | | Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-1335-507/+303
|/ / / /
* | | | Merge branch 'better-parallel-diff' into 'master' Robert Speicher2016-07-133-101/+63
|\ \ \ \
| * | | | Actually render old and new sections of parallel diff next to each otherbetter-parallel-diffDouwe Maan2016-07-134-103/+65
* | | | | Merge branch 'dropdown-load-fix' into 'master' Douwe Maan2016-07-136-3/+21
|\ \ \ \ \
| * | | | | formats my test properlytiagonbotelho2016-07-131-1/+2
| * | | | | deletes swn filetiagonbotelho2016-07-131-0/+0
| * | | | | removes redundant filter_branches filetiagonbotelho2016-07-121-8/+0
| * | | | | fixes test for simplified version of projecttiagonbotelho2016-07-122-1/+9
| * | | | | fixes test according to four-phase test patterntiagonbotelho2016-07-122-0/+1
| * | | | | removes basicprojectwithaccess and replaces it with basicprojectdetailstiagonbotelho2016-07-123-9/+1
| * | | | | Merge branch 'dropdown-load-fix' of gitlab.com:tiagonbotelho/gitlab-ce into d...tiagonbotelho2016-07-120-0/+0
| |\ \ \ \ \
| | * | | | | changes string to symbol in paramtiagonbotelho2016-07-121-1/+1
| | * | | | | moves let variable to it statement by using a local variabletiagonbotelho2016-07-111-2/+2
| | * | | | | adds test to check json fields on simple request and changes the url request ...tiagonbotelho2016-07-115-4/+13
| | * | | | | removes gemfile.lock dotfilestiagonbotelho2016-07-082-0/+0
| | * | | | | fixes missing field on basicprojectdetailstiagonbotelho2016-07-084-0/+2
| | * | | | | changes the project_title_spec accordinglytiagonbotelho2016-07-081-1/+1
| | * | | | | changes the usage of simpleprojectdetails to already implemented basicproject...tiagonbotelho2016-07-083-20/+7
| | * | | | | adds entry to changelogtiagonbotelho2016-07-071-0/+1
| | * | | | | removes debugging printtiagonbotelho2016-07-071-1/+0
| | * | | | | gets the new object through /simple endpoint and renders on the dropdowntiagonbotelho2016-07-072-1/+2
| | * | | | | adds basic functionality to the new endpoint of the apitiagonbotelho2016-07-063-21/+25
| | * | | | | implements filter_paramstiagonbotelho2016-07-063-0/+21
| * | | | | | adds test to check json fields on simple request and changes the url request ...tiagonbotelho2016-07-122-2/+0
| * | | | | | removes gemfile.lock dotfilestiagonbotelho2016-07-122-0/+0
| * | | | | | fixes missing field on basicprojectdetailstiagonbotelho2016-07-123-0/+1
| * | | | | | changes the project_title_spec accordinglytiagonbotelho2016-07-121-0/+1
| * | | | | | changes the usage of simpleprojectdetails to already implemented basicproject...tiagonbotelho2016-07-122-17/+0
| * | | | | | removes debugging printtiagonbotelho2016-07-121-1/+0