Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ambiguous-sha' into 'master'fondev | Dmitriy Zaporozhets | 2014-10-12 | 21 | -27/+48 |
|\ | |||||
| * | Fix tests | Dmitriy Zaporozhets | 2014-10-12 | 1 | -1/+1 |
| * | Fix spinach tests | Dmitriy Zaporozhets | 2014-10-10 | 1 | -1/+1 |
| * | Dontr decoarate already decorated stuff | Dmitriy Zaporozhets | 2014-10-10 | 1 | -1/+7 |
| * | Fix tests | Dmitriy Zaporozhets | 2014-10-10 | 1 | -2/+2 |
| * | Use 8chars short sha for commit in views | Dmitriy Zaporozhets | 2014-10-10 | 5 | -5/+11 |
| * | Dont raise exception when wrong commit id passed | Dmitriy Zaporozhets | 2014-10-10 | 1 | -0/+2 |
| * | Use full commit sha width for reference in note body to prevent Ambiguous SHA... | Dmitriy Zaporozhets | 2014-10-10 | 1 | -1/+1 |
| * | Use short_id instead of [0..N] for short version of commit sha | Dmitriy Zaporozhets | 2014-10-10 | 15 | -21/+28 |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2014-10-12 | 2 | -0/+30 |
|\ \ | |||||
| * \ | Merge branch 'bug_with_apostrophe' into 'master' | Dmitriy Zaporozhets | 2014-10-12 | 2 | -0/+30 |
| |\ \ | |||||
| | * | | Add a comment why this is done. | Marin Jankovski | 2014-10-10 | 1 | -0/+6 |
| | * | | Substitute right single quote back with apostrophe. | Marin Jankovski | 2014-10-10 | 2 | -2/+3 |
| | * | | Add a test for apostrophe in code blocks. | Marin Jankovski | 2014-10-09 | 1 | -0/+8 |
| | * | | Replace apostrophe with right single quote to avoid markdown interpretation a... | Marin Jankovski | 2014-10-09 | 2 | -2/+7 |
| | * | | Failing test for apostrophe at the end of user mention on project with issue ... | Marin Jankovski | 2014-10-09 | 1 | -0/+10 |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-10-12 | 1 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge pull request #7915 from bbodenmiller/patch-12 | Sytse Sijbrandij | 2014-10-12 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * | | | improve wording on protected branches page | Ben Bodenmiller | 2014-10-12 | 1 | -3/+3 |
* | | | | | Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master' | Dmitriy Zaporozhets | 2014-10-12 | 3 | -8/+30 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Make sure relative url and asset_host are honored, specs. | Marin Jankovski | 2014-10-10 | 3 | -3/+20 |
| * | | | | Bump html-pipeline-gitlab gem version | Marin Jankovski | 2014-10-10 | 1 | -2/+4 |
| * | | | | Enable markdown pipeline filters from inside gitlab. | Marin Jankovski | 2014-10-09 | 1 | -8/+11 |
| | |/ / | |/| | | |||||
* | | | | Add more stuff to changelog | Dmitriy Zaporozhets | 2014-10-10 | 1 | -0/+6 |
| |_|/ |/| | | |||||
* | | | Merge branch 'ssl_ciphers' into 'master' | Dmitriy Zaporozhets | 2014-10-10 | 1 | -4/+5 |
|\ \ \ | |||||
| * | | | Add a comment on why we are using backward compatible ciphers. | Marin Jankovski | 2014-10-10 | 1 | -3/+4 |
| * | | | Revert "update ssl_ciphers" | Marin Jankovski | 2014-10-10 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #8004 from mr-vinn/rm-task-method | Marin Jankovski | 2014-10-10 | 1 | -7/+0 |
|\ \ \ | |||||
| * | | | Remove unused method | Vinnie Okada | 2014-10-09 | 1 | -7/+0 |
|/ / / | |||||
* | | | Merge branch 'annotate' into 'master' | Dmitriy Zaporozhets | 2014-10-09 | 29 | -219/+264 |
|\ \ \ | |||||
| * | | | annotate | Valery Sizov | 2014-10-09 | 29 | -219/+264 |
|/ / / | |||||
* | | | Merge branch 't1254-snippets-refactoring' into 'master' | Dmitriy Zaporozhets | 2014-10-09 | 20 | -55/+332 |
|\ \ \ | |||||
| * | | | Snippets: public/internal/private | Valery Sizov | 2014-10-09 | 20 | -55/+332 |
* | | | | Merge branch 'bump-grit' into 'master' | Dmitriy Zaporozhets | 2014-10-09 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Bump gitlab-grit version with improved timeout feature | Dmitriy Zaporozhets | 2014-10-09 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'ruby-version' into 'master' | Dmitriy Zaporozhets | 2014-10-09 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | set the development ruby version automatically | Job van der Voort | 2014-10-09 | 1 | -0/+1 |
* | | | Revert "Up version of html-pipeline-gitlab." | Marin Jankovski | 2014-10-09 | 1 | -3/+2 |
|/ / | |||||
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-10-08 | 1 | -1/+2 |
|\ \ | |||||
| * \ | Merge pull request #7986 from liammonahan/master | Dmitriy Zaporozhets | 2014-10-08 | 1 | -1/+2 |
| |\ \ | |||||
| | * | | Correctly pluralize participants on issue show page. | Liam Monahan | 2014-10-08 | 1 | -1/+2 |
* | | | | Remove border radius because it has wrong background | Dmitriy Zaporozhets | 2014-10-08 | 1 | -2/+0 |
|/ / / | |||||
* | | | Merge branch 'improve-danger-zone' into 'master' | Dmitriy Zaporozhets | 2014-10-08 | 11 | -113/+156 |
|\ \ \ | |||||
| * | | | Restyle colorful panel boxes | Dmitriy Zaporozhets | 2014-10-08 | 6 | -40/+33 |
| * | | | Improve project remove spec | Dmitriy Zaporozhets | 2014-10-08 | 1 | -2/+6 |
| * | | | Apply ConfirmDangerModal for project transfer/remove actions | Dmitriy Zaporozhets | 2014-10-08 | 3 | -7/+22 |
| * | | | ConfirmDangerModal window added. It will be used for confirmation of dangerou... | Dmitriy Zaporozhets | 2014-10-08 | 2 | -0/+42 |
| * | | | show danger settings by default | Dmitriy Zaporozhets | 2014-10-08 | 1 | -86/+75 |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-10-08 | 5 | -7/+213 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #7988 from marcaube/patch-1 | Robert Schilling | 2014-10-08 | 1 | -1/+4 |
| |\ \ \ \ |