summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Be more intelligent about sanitizing links with unsafe protocolsrs-issue-14220Robert Speicher2016-03-142-2/+27
* Merge branch 'rs-note-active-spec' into 'master'Robert Speicher2016-03-142-13/+82
|\
| * Add unit specs for `Note#active?`rs-note-active-specRobert Speicher2016-03-112-13/+82
* | Merge branch 'updated-project-home-icon' into 'master' Jacob Schatz2016-03-141-1/+1
|\ \
| * | Changed project home iconPhil Hughes2016-03-141-1/+1
* | | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-1444-11/+626
|\ \ \
| * | | Bring share project with group API from EEshare-project-ceDmitriy Zaporozhets2016-03-134-0/+81
| * | | Render project members from shared groupDmitriy Zaporozhets2016-03-123-0/+25
| * | | Bring share with group feature documentation from EEDmitriy Zaporozhets2016-03-127-0/+45
| * | | Bring shared project feature tests from EEDmitriy Zaporozhets2016-03-126-1/+125
| * | | Add share project from group lockDmitriy Zaporozhets2016-03-115-6/+20
| * | | Add finders logic and tests for shared projects featureDmitriy Zaporozhets2016-03-115-2/+86
| * | | Allow users to access project shared with their groupDmitriy Zaporozhets2016-03-111-1/+51
| * | | Show shared projects on group pageDmitriy Zaporozhets2016-03-113-0/+27
| * | | Add functionality to setup share of project with group via project settingsDmitriy Zaporozhets2016-03-116-0/+79
| * | | Bring ProjectGroupLink model and migrations from EEDmitriy Zaporozhets2016-03-118-3/+89
* | | | Merge branch 'rs-prepare-8-6' into 'master' Robert Speicher2016-03-143-3/+167
|\ \ \ \
| * | | | Update GITLAB_SHELL_VERSION to match EERobert Speicher2016-03-142-2/+2
| * | | | Fix ordering in 8.5-to-8.6 update guiders-prepare-8-6Robert Speicher2016-03-121-11/+13
| * | | | Added 8.6 upgrade guide for PostgreSQL usersYorick Peterse2016-03-111-0/+17
| * | | | Prepare docs for 8.6 RC1Robert Speicher2016-03-102-2/+147
* | | | | Merge branch 'rs-snippet-expires-api' into 'master' Robert Speicher2016-03-145-0/+24
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Don't remove `ProjectSnippet#expires_at` from APIrs-snippet-expires-apiRobert Speicher2016-03-095-0/+24
* | | | | Merge branch 'issue-filter-tests' into 'master' Robert Speicher2016-03-144-20/+14
|\ \ \ \ \
| * | | | | Fixed tests for MR & issue filtersissue-filter-testsPhil Hughes2016-03-144-20/+14
* | | | | | Merge branch 'remove-sleeps-from-network-graph-spec' into 'master' Robert Speicher2016-03-142-5/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove sleeps from network graph feature specStan Hu2016-03-132-5/+7
* | | | | | Merge branch 'improve-issues-filter-all-spec' into 'master' Dmitriy Zaporozhets2016-03-142-9/+6
|\ \ \ \ \ \
| * | | | | | Use Capybara find methods and remove sleeps in feature specs in "All Issues" ...improve-issues-filter-all-specStan Hu2016-03-132-9/+6
| |/ / / / /
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-03-145-23/+20
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'redirect-host-check' into 'master' Douwe Maan2016-03-135-23/+20
| |\ \ \ \ \ \
| | * | | | | | Fix denting and specZeger-Jan van de Weg2016-03-133-4/+4
| | * | | | | | ContinueToParams -> ContinueParamsZeger-Jan van de Weg2016-03-134-4/+5
| | * | | | | | Check redirect path in the continue_paramsZeger-Jan van de Weg2016-03-133-21/+17
| |/ / / / / /
* | | | | | | Merge branch 'upcoming' into 'master' Douwe Maan2016-03-134-0/+14
|\ \ \ \ \ \ \
| * | | | | | | fixes small issuestiagonbotelho2016-03-132-3/+2
| * | | | | | | removes tab and replaces with space in changelogtiagonbotelho2016-03-121-0/+1
| * | | | | | | adds my name to changelogtiagonbotelho2016-03-121-0/+1
| * | | | | | | fixes issuestiagonbotelho2016-03-122-5/+4
| * | | | | | | fixes issues for mr acceptancetiagonbotelho2016-03-122-8/+12
| * | | | | | | implements upcoming filter in milstonestiagonbotelho2016-03-123-0/+10
* | | | | | | | Merge branch 'reduce-example-duplication' into 'master' Sytse Sijbrandij2016-03-133-37/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove duplicate entries.Sytse Sijbrandij2016-03-121-6/+2
| * | | | | | | | Reduce example documentation.reduce-example-duplicationSytse Sijbrandij2016-03-103-37/+17
* | | | | | | | | Merge branch 'revert-5a586f36' into 'master' Douwe Maan2016-03-126-16/+82
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-126-16/+82
|/ / / / / / / /
* | | | | | | | Merge branch 'remove-goget-spec' into 'master' Douwe Maan2016-03-121-13/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove unnecessary go-get test (superseded by middleware)Stan Hu2016-03-121-13/+0
|/ / / / / / /
* | | | | | | Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-126-82/+16
* | | | | | | Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-126-16/+82
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |