summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Abiliy to disable 'Share with Group' featuredisable_share_with_groupValery Sizov2015-09-3011-18/+86
* Merge branch 'rs-changelog' into 'master' Robert Speicher2015-09-222-2/+45
|\
| * Update CHANGELOG-EERobert Speicher2015-09-221-1/+5
| * Sync CHANGELOG with CERobert Speicher2015-09-221-1/+40
|/
* Merge branch 'ce-to-ee' into 'master' Dmitriy Zaporozhets2015-09-22532-976/+17162
|\
| * Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-eeDmitriy Zaporozhets2015-09-22532-976/+17162
| |\ |/ /
| * Merge branch 'fix-ci-permissions' into 'master' Dmitriy Zaporozhets2015-09-223-42/+45
| |\
| | * Update CHANGELOGfix-ci-permissionsKamil Trzcinski2015-09-211-0/+2
| | * Fix permissions problemsKamil Trzcinski2015-09-212-42/+43
| * | Merge branch 'fix-ci-migration-docs' into 'master' Marin Jankovski2015-09-222-26/+2
| |\ \
| | * | Add missing rake and change nginx config for CI migrationKamil Trzcinski2015-09-222-26/+2
| |/ /
| * | Merge branch 'rs-ci-migration-guide' into 'master' Robert Speicher2015-09-221-220/+264
| |\ \
| | * | Add note about automatically re-enabling CI during migrate taskrs-ci-migration-guideRobert Speicher2015-09-211-0/+3
| | * | Remove unintended linebreakRobert Speicher2015-09-211-2/+2
| | * | Be consistent about "only required for manual install" notesRobert Speicher2015-09-211-5/+8
| | * | More migration guide updatesRobert Speicher2015-09-211-34/+67
| | * | WhitespaceRobert Speicher2015-09-211-14/+14
| | * | Add commands for Omnibus installationKamil Trzcinski2015-09-211-11/+62
| | * | Update guideKamil Trzcinski2015-09-211-19/+32
| | * | More migration guide updatesRobert Speicher2015-09-201-28/+33
| | * | Update migration guideKamil Trzcinski2015-09-201-130/+22
| | * | Redcarpet didn't like unordered lists deeply nested in an ordered oneRobert Speicher2015-09-171-41/+41
| | * | Fix link to "create a database dump" headerRobert Speicher2015-09-171-1/+1
| | * | Indent database dump steps one more levelRobert Speicher2015-09-171-39/+39
| | * | Reformat and copy edit the CI-to-CE migration guideRobert Speicher2015-09-171-187/+231
| * | | Merge branch 'tweak-more-css-for-md-preview' into 'master' Robert Speicher2015-09-223-3/+3
| |\ \ \
| | * | | Tweak remaining CSS for Markdown previewStan Hu2015-09-213-3/+3
| |/ / /
| * | | Merge branch 'rs-fix-spec-warnings' into 'master' Robert Speicher2015-09-214-4/+8
| |\ \ \
| | * | | Ensure raise_error expectations provide argumentsrs-fix-spec-warningsRobert Speicher2015-09-214-4/+8
| * | | | Merge branch 'fix-issue-2593' into 'master' Robert Speicher2015-09-213-5/+36
| |\ \ \ \
| | * | | | Fix Error 500 when comparing non-existing branchesfix-issue-2593Stan Hu2015-09-183-5/+36
| * | | | | Merge branch 'fix-dangling-milestone-ids' into 'master' Stan Hu2015-09-211-0/+5
| |\ \ \ \ \
| | * | | | | Remove deleted milestones from merge requestsStan Hu2015-09-211-0/+5
| * | | | | | Merge branch 'rs-relative-link-up-one' into 'master' Robert Speicher2015-09-212-15/+51
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Allow RelativeLinkFilter to go up multiple directoriesrs-relative-link-up-oneRobert Speicher2015-09-202-2/+9
| | * | | | | Allow relative links to go up one directory levelRobert Speicher2015-09-182-15/+44
| * | | | | | Merge branch 'rename-reply-by-email' into 'master' Robert Speicher2015-09-2117-175/+150
| |\ \ \ \ \ \
| | * | | | | | Tweak textrename-reply-by-emailDouwe Maan2015-09-212-4/+4
| | * | | | | | Merge branch 'master' into rename-reply-by-emailDouwe Maan2015-09-2120-84/+266
| | |\ \ \ \ \ \
| | * | | | | | | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-2117-175/+151
| * | | | | | | | Merge branch 'ci-import-improvements' into 'master' Kamil TrzciƄski2015-09-212-2/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Relax CI version check during importci-import-improvementsJacob Vosmaer2015-09-211-1/+3
| | * | | | | | | | Make importing builds less noisyJacob Vosmaer2015-09-211-1/+1
| * | | | | | | | | Merge branch 'fix-ci-handling' into 'master' Dmitriy Zaporozhets2015-09-212-3/+8
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Fixed MR handling when GitLab CI project is not presentfix-ci-handlingKamil Trzcinski2015-09-212-3/+8
| * | | | | | | | | Merge branch 'fix-note-edit-preview-css' into 'master' Robert Speicher2015-09-214-3/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | More tweaks to make note edit/preview CSS consistentStan Hu2015-09-214-3/+7
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'fix-mr-without-refs' into 'master' Dmitriy Zaporozhets2015-09-212-1/+20
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refsDmitriy Zaporozhets2015-09-212-1/+20
| | |/ / / / / / / /
| * | | | | | | | | Fix grammarSytse Sijbrandij2015-09-211-2/+2