Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Be more intelligent about sanitizing links with unsafe protocolsrs-issue-14220 | Robert Speicher | 2016-03-14 | 2 | -2/+27 |
* | Merge branch 'rs-note-active-spec' into 'master' | Robert Speicher | 2016-03-14 | 2 | -13/+82 |
|\ | |||||
| * | Add unit specs for `Note#active?`rs-note-active-spec | Robert Speicher | 2016-03-11 | 2 | -13/+82 |
* | | Merge branch 'updated-project-home-icon' into 'master' | Jacob Schatz | 2016-03-14 | 1 | -1/+1 |
|\ \ | |||||
| * | | Changed project home icon | Phil Hughes | 2016-03-14 | 1 | -1/+1 |
* | | | Merge branch 'share-project-ce' into 'master' | Dmitriy Zaporozhets | 2016-03-14 | 44 | -11/+626 |
|\ \ \ | |||||
| * | | | Bring share project with group API from EEshare-project-ce | Dmitriy Zaporozhets | 2016-03-13 | 4 | -0/+81 |
| * | | | Render project members from shared group | Dmitriy Zaporozhets | 2016-03-12 | 3 | -0/+25 |
| * | | | Bring share with group feature documentation from EE | Dmitriy Zaporozhets | 2016-03-12 | 7 | -0/+45 |
| * | | | Bring shared project feature tests from EE | Dmitriy Zaporozhets | 2016-03-12 | 6 | -1/+125 |
| * | | | Add share project from group lock | Dmitriy Zaporozhets | 2016-03-11 | 5 | -6/+20 |
| * | | | Add finders logic and tests for shared projects feature | Dmitriy Zaporozhets | 2016-03-11 | 5 | -2/+86 |
| * | | | Allow users to access project shared with their group | Dmitriy Zaporozhets | 2016-03-11 | 1 | -1/+51 |
| * | | | Show shared projects on group page | Dmitriy Zaporozhets | 2016-03-11 | 3 | -0/+27 |
| * | | | Add functionality to setup share of project with group via project settings | Dmitriy Zaporozhets | 2016-03-11 | 6 | -0/+79 |
| * | | | Bring ProjectGroupLink model and migrations from EE | Dmitriy Zaporozhets | 2016-03-11 | 8 | -3/+89 |
* | | | | Merge branch 'rs-prepare-8-6' into 'master' | Robert Speicher | 2016-03-14 | 3 | -3/+167 |
|\ \ \ \ | |||||
| * | | | | Update GITLAB_SHELL_VERSION to match EE | Robert Speicher | 2016-03-14 | 2 | -2/+2 |
| * | | | | Fix ordering in 8.5-to-8.6 update guiders-prepare-8-6 | Robert Speicher | 2016-03-12 | 1 | -11/+13 |
| * | | | | Added 8.6 upgrade guide for PostgreSQL users | Yorick Peterse | 2016-03-11 | 1 | -0/+17 |
| * | | | | Prepare docs for 8.6 RC1 | Robert Speicher | 2016-03-10 | 2 | -2/+147 |
* | | | | | Merge branch 'rs-snippet-expires-api' into 'master' | Robert Speicher | 2016-03-14 | 5 | -0/+24 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Don't remove `ProjectSnippet#expires_at` from APIrs-snippet-expires-api | Robert Speicher | 2016-03-09 | 5 | -0/+24 |
* | | | | | Merge branch 'issue-filter-tests' into 'master' | Robert Speicher | 2016-03-14 | 4 | -20/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed tests for MR & issue filtersissue-filter-tests | Phil Hughes | 2016-03-14 | 4 | -20/+14 |
* | | | | | | Merge branch 'remove-sleeps-from-network-graph-spec' into 'master' | Robert Speicher | 2016-03-14 | 2 | -5/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Remove sleeps from network graph feature spec | Stan Hu | 2016-03-13 | 2 | -5/+7 |
* | | | | | | Merge branch 'improve-issues-filter-all-spec' into 'master' | Dmitriy Zaporozhets | 2016-03-14 | 2 | -9/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use Capybara find methods and remove sleeps in feature specs in "All Issues" ...improve-issues-filter-all-spec | Stan Hu | 2016-03-13 | 2 | -9/+6 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Marin Jankovski | 2016-03-14 | 5 | -23/+20 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'redirect-host-check' into 'master' | Douwe Maan | 2016-03-13 | 5 | -23/+20 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix denting and spec | Zeger-Jan van de Weg | 2016-03-13 | 3 | -4/+4 |
| | * | | | | | | ContinueToParams -> ContinueParams | Zeger-Jan van de Weg | 2016-03-13 | 4 | -4/+5 |
| | * | | | | | | Check redirect path in the continue_params | Zeger-Jan van de Weg | 2016-03-13 | 3 | -21/+17 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'upcoming' into 'master' | Douwe Maan | 2016-03-13 | 4 | -0/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fixes small issues | tiagonbotelho | 2016-03-13 | 2 | -3/+2 |
| * | | | | | | | removes tab and replaces with space in changelog | tiagonbotelho | 2016-03-12 | 1 | -0/+1 |
| * | | | | | | | adds my name to changelog | tiagonbotelho | 2016-03-12 | 1 | -0/+1 |
| * | | | | | | | fixes issues | tiagonbotelho | 2016-03-12 | 2 | -5/+4 |
| * | | | | | | | fixes issues for mr acceptance | tiagonbotelho | 2016-03-12 | 2 | -8/+12 |
| * | | | | | | | implements upcoming filter in milstones | tiagonbotelho | 2016-03-12 | 3 | -0/+10 |
* | | | | | | | | Merge branch 'reduce-example-duplication' into 'master' | Sytse Sijbrandij | 2016-03-13 | 3 | -37/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove duplicate entries. | Sytse Sijbrandij | 2016-03-12 | 1 | -6/+2 |
| * | | | | | | | | Reduce example documentation.reduce-example-duplication | Sytse Sijbrandij | 2016-03-10 | 3 | -37/+17 |
* | | | | | | | | | Merge branch 'revert-5a586f36' into 'master' | Douwe Maan | 2016-03-12 | 6 | -16/+82 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' "" | Stan Hu | 2016-03-12 | 6 | -16/+82 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'remove-goget-spec' into 'master' | Douwe Maan | 2016-03-12 | 1 | -13/+0 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Remove unnecessary go-get test (superseded by middleware) | Stan Hu | 2016-03-12 | 1 | -13/+0 |
|/ / / / / / / | |||||
* | | | | | | | Revert "Merge branch 'support-go-subpackages' into 'master' " | Douwe Maan | 2016-03-12 | 6 | -82/+16 |
* | | | | | | | Merge branch 'support-go-subpackages' into 'master' | Douwe Maan | 2016-03-12 | 6 | -16/+82 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | |