summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add parenthesis to function def with arguments.Ciro Santilli2014-10-0333-67/+67
* Merge pull request #7946 from Razer6/changelog_entryRobert Schilling2014-10-031-0/+1
|\
| * Add move to html-pipeline-gitlab to changelogRobert Schilling2014-10-031-0/+1
|/
* Merge pull request #7834 from cirosantilli/rm-empty-eqRobert Schilling2014-10-031-3/+0
|\
| * Remove test line without effect because no should.Ciro Santilli2014-09-231-3/+0
* | Merge pull request #7922 from cirosantilli/improve-remove-file-commit-placeho...Robert Schilling2014-10-031-1/+2
|\ \
| * | Improve remove file textarea placeholder.Ciro Santilli2014-09-301-1/+2
* | | Merge branch 'show-build-coverage-in-mr' into 'master'Dmitriy Zaporozhets2014-10-024-5/+37
|\ \ \
| * | | Show test coverage results in MR if availableDmitriy Zaporozhets2014-10-024-5/+37
* | | | Merge branch 'fix-500-admin-user-page' into 'master'Dmitriy Zaporozhets2014-10-023-1/+26
|\ \ \ \ | |/ / / |/| | |
| * | | Fix 500 error on admin user pageDmitriy Zaporozhets2014-10-021-1/+1
| * | | Add test for broken admin user pageDmitriy Zaporozhets2014-10-022-0/+25
* | | | Comment random failing testDmitriy Zaporozhets2014-10-021-12/+14
|/ / /
* | | Merge branch 'Razer6-feature/zen_for_gfm'Marin Jankovski2014-10-026-13/+28
|\ \ \
| * \ \ Merge branch 'feature/zen_for_gfm' of github.com:Razer6/gitlabhq into Razer6-...Marin Jankovski2014-10-026-13/+28
| |\ \ \ |/ / / /
| * | | Apply ZEN mode to all GFM formsRobert Schilling2014-10-026-13/+28
* | | | Merge branch 'missing_update_links' into 'master'Jacob Vosmaer2014-10-021-4/+16
|\ \ \ \
| * | | | Update the help/update docs to include omnibus as well.Achilleas Pipinellis2014-10-021-4/+16
* | | | | Merge branch 'gitlab_flow_edit' into 'master'Sytse Sijbrandij2014-10-021-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Edit GitHub Flow urlMartijn2014-10-021-2/+2
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-10-024-6/+23
|\ \ \ \ \
| * \ \ \ \ Merge branch 'backup_fail_hard' into 'master'Dmitriy Zaporozhets2014-10-024-6/+23
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fail harder in the backup scriptJacob Vosmaer2014-10-014-6/+23
* | | | | | Merge branch 'factor-issue-mr-form-label' of https://github.com/cirosantilli/...Dmitriy Zaporozhets2014-10-024-33/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Factor issue and edit MR form label field and submit.Ciro Santilli2014-09-224-34/+22
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2014-10-023-4/+4
|\ \ \ \ \
| * \ \ \ \ Merge pull request #7921 from cirosantilli/improve-new-file-commit-placeholderRobert Schilling2014-10-021-1/+2
| |\ \ \ \ \
| | * | | | | Improve new file commit placeholder.Ciro Santilli2014-09-301-1/+2
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #7881 from cirosantilli/rm-blame-extra-whiteRobert Schilling2014-10-021-1/+1
| |\ \ \ \ \
| | * | | | | Remove blame lines added leading whitespace.Ciro Santilli2014-10-011-1/+1
| * | | | | | Merge pull request #7880 from cirosantilli/replace-erb-hamlRobert Schilling2014-10-021-2/+1
| |\ \ \ \ \ \
| | * | | | | | Replace :erb filter with plain HAML.Ciro Santilli2014-10-011-2/+1
| | |/ / / / /
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSytse Sijbrandij2014-10-022-5/+3
|\ \ \ \ \ \ \
| * | | | | | | Bump gitlab_gitDmitriy Zaporozhets2014-10-022-5/+3
| |/ / / / / /
* | | | | | | Add docs for the issue closing pattern.Sytse Sijbrandij2014-10-023-0/+10
|/ / / / / /
* | | | | | Merge pull request #7853 from Razer6/feature/html_pipelineDmitriy Zaporozhets2014-10-025-34/+34
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Factor out Emoji parsing using html-pipeline-gitlabRobert Schilling2014-09-265-35/+35
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2014-10-021-1/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #7920 from cirosantilli/simplify-commit-noteSytse Sijbrandij2014-10-021-1/+2
| |\ \ \ \ \ \
| | * | | | | | Simplify custom MR good commit message hint.Ciro Santilli2014-09-301-1/+2
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2014-10-020-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix_selecting_them_upload' into 'master'Marin Jankovski2014-10-028-17/+21
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix_selecting_them_upload' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2014-10-028-17/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Search for 'div-dropzone' correctlyfix_selecting_them_uploadRobert Schilling2014-10-017-7/+7
| * | | | | | Disable dropzone in ZEN modeRobert Schilling2014-10-011-0/+4
| * | | | | | Fix attachment upload link bug caused by introduction of zen mode.Marin Jankovski2014-09-301-11/+11
| |/ / / / /
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2014-10-027-31/+36
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #7904 from cirosantilli/titleize-actionsRobert Schilling2014-10-016-31/+36
| |\ \ \ \ \ \
| | * | | | | | Titleize blob action buttons.Ciro Santilli2014-09-306-31/+36
| | |/ / / / /
| * | | | | | Merge pull request #7930 from cirosantilli/group-test-upRobert Schilling2014-10-011-0/+0
| |\ \ \ \ \ \