summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* disallow irrelevant pages by default in robotsBen Bodenmiller2015-08-172-1/+63
* Merge branch 'bump-gitlab-git' into 'master'Stan Hu2015-08-183-3/+4
|\
| * Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodulesStan Hu2015-08-173-3/+4
|/
* Merge branch 'rs-remove-gfm_with_options' into 'master'Douwe Maan2015-08-173-14/+4
|\
| * Remove the `gfm_with_options` helperrs-remove-gfm_with_optionsRobert Speicher2015-08-123-14/+4
* | Merge branch 'fix-backslashes-inline-diff' into 'master'Douwe Maan2015-08-173-2/+45
|\ \
| * | Fix bug where backslashes in inline diffs could be droppedStan Hu2015-08-113-2/+45
* | | Merge branch 'code-import-error-ui-improvements' into 'master'Douwe Maan2015-08-171-1/+1
|\ \ \
| * | | Improve error message display when project fails to importStan Hu2015-08-111-1/+1
* | | | Merge pull request #9565 from gitlabhq/revert-9528-Fixed_alignment_issueDmitriy Zaporozhets2015-08-171-12/+1
|\ \ \ \
| * | | | Revert "Fix for #9527"Dmitriy Zaporozhets2015-08-171-12/+1
|/ / / /
* | | | Merge branch 'installation-update-guides' into 'master'Dmitriy Zaporozhets2015-08-173-14/+143
|\ \ \ \
| * | | | Create update guides for 7.14installation-update-guidesDmitriy Zaporozhets2015-08-172-12/+141
| * | | | Update installation guide with 7.14Dmitriy Zaporozhets2015-08-171-2/+2
|/ / / /
* | | | Merge branch 'rs-check-ruby-version' into 'master'Robert Speicher2015-08-161-1/+1
|\ \ \ \
| * | | | Require Ruby 2.1.0 in `gitlab:app:check` taskRobert Speicher2015-08-151-1/+1
|/ / / /
* | | | Merge branch 'changelog-1124' into 'master'Robert Schilling2015-08-151-0/+1
|\ \ \ \
| * | | | Update changelog for MR !1124Sven Strickroth2015-08-151-0/+1
|/ / / /
* | | | Merge branch 'rs-gem-security' into 'master'Robert Speicher2015-08-152-7/+7
|\ \ \ \
| * | | | Bump omniauth-saml to 1.4.1rs-gem-securityRobert Speicher2015-08-142-7/+7
|/ / / /
* | | | Merge branch 'fix/redirect_after_sign_in' into 'master'Stan Hu2015-08-142-18/+22
|\ \ \ \
| * | | | Fix redirection after sign in when using auto_sign_in_with_providerAlex Lossent2015-08-122-18/+22
* | | | | Merge branch 'mysql_insecure_password_warnings' into 'master'Stan Hu2015-08-141-2/+5
|\ \ \ \ \
| * | | | | Workaround the warnings emitted by MySQL 5.6 regarding password on theTed Strzalkowski2015-08-121-2/+5
* | | | | | Merge pull request #9528 from revaret/Fixed_alignment_issueStan Hu2015-08-141-1/+12
|\ \ \ \ \ \
| * | | | | | Fixed #9527ranjith2015-08-131-1/+12
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-08-143-1/+39
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'Dmitriy Zaporozhets2015-08-143-1/+39
| |\ \ \ \ \ \ \
| | * | | | | | | Disable internal issue tracker if external tracker in useStan Hu2015-07-173-1/+39
* | | | | | | | | Merge pull request #9562 from bladealslayer/fix/flowdock-gem-updateStan Hu2015-08-145-9/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update Flowdock integration to support new Flowdock APIBoyan Tabakov2015-08-145-9/+18
|/ / / / / / / /
* | | | | | | | Merge branch 'improve-readability' into 'master'Dmitriy Zaporozhets2015-08-144-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Add CHANGELOG itemDmitriy Zaporozhets2015-08-141-0/+1
| * | | | | | | | Set max-width for README, issue and merge request descriptionDmitriy Zaporozhets2015-08-143-0/+10
|/ / / / / / / /
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-142-0/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'respect_filters' into 'master'Dmitriy Zaporozhets2015-08-142-0/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix: User search feature in admin area does not respect filtersrespect_filtersValery Sizov2015-08-132-0/+2
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-1417-32/+110
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-08-132-2/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge pull request #9556 from pupaxxo/patch-3Stan Hu2015-08-131-1/+0
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix changelogAndrea Ruggiero2015-08-131-1/+0
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Merge pull request #9557 from pupaxxo/patch-4Robert Schilling2015-08-131-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Time for 7.14.0.preAndrea Ruggiero2015-08-131-1/+1
| | |/ / / / / /
| * | | | | | | Merge branch 'improve-hipchat-service-test' into 'master'Dmitriy Zaporozhets2015-08-137-3/+76
| |\ \ \ \ \ \ \
| | * | | | | | | Provide more feedback what went wrong if HipChat service failed testStan Hu2015-08-127-3/+76
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'bring-clonebar-back' into 'master'Dmitriy Zaporozhets2015-08-132-10/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Bring clone bar backStan Hu2015-08-122-10/+0
| * | | | | | | | Merge branch 'update_changelog' into 'master'Valery Sizov2015-08-131-0/+6
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | update chnagelogValery Sizov2015-08-131-0/+6
| |/ / / / / / /
| * | | | | | | Merge branch 'note-query-information' into 'master'Stan Hu2015-08-123-2/+15
| |\ \ \ \ \ \ \