Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | disallow irrelevant pages by default in robots | Ben Bodenmiller | 2015-08-17 | 2 | -1/+63 |
* | Merge branch 'bump-gitlab-git' into 'master' | Stan Hu | 2015-08-18 | 3 | -3/+4 |
|\ | |||||
| * | Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules | Stan Hu | 2015-08-17 | 3 | -3/+4 |
|/ | |||||
* | Merge branch 'rs-remove-gfm_with_options' into 'master' | Douwe Maan | 2015-08-17 | 3 | -14/+4 |
|\ | |||||
| * | Remove the `gfm_with_options` helperrs-remove-gfm_with_options | Robert Speicher | 2015-08-12 | 3 | -14/+4 |
* | | Merge branch 'fix-backslashes-inline-diff' into 'master' | Douwe Maan | 2015-08-17 | 3 | -2/+45 |
|\ \ | |||||
| * | | Fix bug where backslashes in inline diffs could be dropped | Stan Hu | 2015-08-11 | 3 | -2/+45 |
* | | | Merge branch 'code-import-error-ui-improvements' into 'master' | Douwe Maan | 2015-08-17 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Improve error message display when project fails to import | Stan Hu | 2015-08-11 | 1 | -1/+1 |
* | | | | Merge pull request #9565 from gitlabhq/revert-9528-Fixed_alignment_issue | Dmitriy Zaporozhets | 2015-08-17 | 1 | -12/+1 |
|\ \ \ \ | |||||
| * | | | | Revert "Fix for #9527" | Dmitriy Zaporozhets | 2015-08-17 | 1 | -12/+1 |
|/ / / / | |||||
* | | | | Merge branch 'installation-update-guides' into 'master' | Dmitriy Zaporozhets | 2015-08-17 | 3 | -14/+143 |
|\ \ \ \ | |||||
| * | | | | Create update guides for 7.14installation-update-guides | Dmitriy Zaporozhets | 2015-08-17 | 2 | -12/+141 |
| * | | | | Update installation guide with 7.14 | Dmitriy Zaporozhets | 2015-08-17 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge branch 'rs-check-ruby-version' into 'master' | Robert Speicher | 2015-08-16 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Require Ruby 2.1.0 in `gitlab:app:check` task | Robert Speicher | 2015-08-15 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch 'changelog-1124' into 'master' | Robert Schilling | 2015-08-15 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Update changelog for MR !1124 | Sven Strickroth | 2015-08-15 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge branch 'rs-gem-security' into 'master' | Robert Speicher | 2015-08-15 | 2 | -7/+7 |
|\ \ \ \ | |||||
| * | | | | Bump omniauth-saml to 1.4.1rs-gem-security | Robert Speicher | 2015-08-14 | 2 | -7/+7 |
|/ / / / | |||||
* | | | | Merge branch 'fix/redirect_after_sign_in' into 'master' | Stan Hu | 2015-08-14 | 2 | -18/+22 |
|\ \ \ \ | |||||
| * | | | | Fix redirection after sign in when using auto_sign_in_with_provider | Alex Lossent | 2015-08-12 | 2 | -18/+22 |
* | | | | | Merge branch 'mysql_insecure_password_warnings' into 'master' | Stan Hu | 2015-08-14 | 1 | -2/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Workaround the warnings emitted by MySQL 5.6 regarding password on the | Ted Strzalkowski | 2015-08-12 | 1 | -2/+5 |
* | | | | | | Merge pull request #9528 from revaret/Fixed_alignment_issue | Stan Hu | 2015-08-14 | 1 | -1/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed #9527 | ranjith | 2015-08-13 | 1 | -1/+12 |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Stan Hu | 2015-08-14 | 3 | -1/+39 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'disable-internal-tracker-when-external-in-use' into 'master' | Dmitriy Zaporozhets | 2015-08-14 | 3 | -1/+39 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Disable internal issue tracker if external tracker in use | Stan Hu | 2015-07-17 | 3 | -1/+39 |
* | | | | | | | | | Merge pull request #9562 from bladealslayer/fix/flowdock-gem-update | Stan Hu | 2015-08-14 | 5 | -9/+18 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Update Flowdock integration to support new Flowdock API | Boyan Tabakov | 2015-08-14 | 5 | -9/+18 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'improve-readability' into 'master' | Dmitriy Zaporozhets | 2015-08-14 | 4 | -0/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add CHANGELOG item | Dmitriy Zaporozhets | 2015-08-14 | 1 | -0/+1 |
| * | | | | | | | | Set max-width for README, issue and merge request description | Dmitriy Zaporozhets | 2015-08-14 | 3 | -0/+10 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-08-14 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'respect_filters' into 'master' | Dmitriy Zaporozhets | 2015-08-14 | 2 | -0/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix: User search feature in admin area does not respect filtersrespect_filters | Valery Sizov | 2015-08-13 | 2 | -0/+2 |
* | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-08-14 | 17 | -32/+110 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Stan Hu | 2015-08-13 | 2 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Merge pull request #9556 from pupaxxo/patch-3 | Stan Hu | 2015-08-13 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | Fix changelog | Andrea Ruggiero | 2015-08-13 | 1 | -1/+0 |
| | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | * | | | | | | | Merge pull request #9557 from pupaxxo/patch-4 | Robert Schilling | 2015-08-13 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | | * | | | | | | Time for 7.14.0.pre | Andrea Ruggiero | 2015-08-13 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'improve-hipchat-service-test' into 'master' | Dmitriy Zaporozhets | 2015-08-13 | 7 | -3/+76 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Provide more feedback what went wrong if HipChat service failed test | Stan Hu | 2015-08-12 | 7 | -3/+76 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'bring-clonebar-back' into 'master' | Dmitriy Zaporozhets | 2015-08-13 | 2 | -10/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Bring clone bar back | Stan Hu | 2015-08-12 | 2 | -10/+0 |
| * | | | | | | | | Merge branch 'update_changelog' into 'master' | Valery Sizov | 2015-08-13 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | update chnagelog | Valery Sizov | 2015-08-13 | 1 | -0/+6 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'note-query-information' into 'master' | Stan Hu | 2015-08-12 | 3 | -2/+15 |
| |\ \ \ \ \ \ \ |