summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ambiguous-sha' into 'master'fondevDmitriy Zaporozhets2014-10-1221-27/+48
|\
| * Fix testsDmitriy Zaporozhets2014-10-121-1/+1
| * Fix spinach testsDmitriy Zaporozhets2014-10-101-1/+1
| * Dontr decoarate already decorated stuffDmitriy Zaporozhets2014-10-101-1/+7
| * Fix testsDmitriy Zaporozhets2014-10-101-2/+2
| * Use 8chars short sha for commit in viewsDmitriy Zaporozhets2014-10-105-5/+11
| * Dont raise exception when wrong commit id passedDmitriy Zaporozhets2014-10-101-0/+2
| * Use full commit sha width for reference in note body to prevent Ambiguous SHA...Dmitriy Zaporozhets2014-10-101-1/+1
| * Use short_id instead of [0..N] for short version of commit shaDmitriy Zaporozhets2014-10-1015-21/+28
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-10-122-0/+30
|\ \
| * \ Merge branch 'bug_with_apostrophe' into 'master'Dmitriy Zaporozhets2014-10-122-0/+30
| |\ \
| | * | Add a comment why this is done.Marin Jankovski2014-10-101-0/+6
| | * | Substitute right single quote back with apostrophe.Marin Jankovski2014-10-102-2/+3
| | * | Add a test for apostrophe in code blocks.Marin Jankovski2014-10-091-0/+8
| | * | Replace apostrophe with right single quote to avoid markdown interpretation a...Marin Jankovski2014-10-092-2/+7
| | * | Failing test for apostrophe at the end of user mention on project with issue ...Marin Jankovski2014-10-091-0/+10
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-121-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pull request #7915 from bbodenmiller/patch-12Sytse Sijbrandij2014-10-121-3/+3
| |\ \ \
| | * | | improve wording on protected branches pageBen Bodenmiller2014-10-121-3/+3
* | | | | Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master'Dmitriy Zaporozhets2014-10-123-8/+30
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make sure relative url and asset_host are honored, specs.Marin Jankovski2014-10-103-3/+20
| * | | | Bump html-pipeline-gitlab gem versionMarin Jankovski2014-10-101-2/+4
| * | | | Enable markdown pipeline filters from inside gitlab.Marin Jankovski2014-10-091-8/+11
| | |/ / | |/| |
* | | | Add more stuff to changelogDmitriy Zaporozhets2014-10-101-0/+6
| |_|/ |/| |
* | | Merge branch 'ssl_ciphers' into 'master'Dmitriy Zaporozhets2014-10-101-4/+5
|\ \ \
| * | | Add a comment on why we are using backward compatible ciphers.Marin Jankovski2014-10-101-3/+4
| * | | Revert "update ssl_ciphers"Marin Jankovski2014-10-101-1/+1
|/ / /
* | | Merge pull request #8004 from mr-vinn/rm-task-methodMarin Jankovski2014-10-101-7/+0
|\ \ \
| * | | Remove unused methodVinnie Okada2014-10-091-7/+0
|/ / /
* | | Merge branch 'annotate' into 'master'Dmitriy Zaporozhets2014-10-0929-219/+264
|\ \ \
| * | | annotateValery Sizov2014-10-0929-219/+264
|/ / /
* | | Merge branch 't1254-snippets-refactoring' into 'master'Dmitriy Zaporozhets2014-10-0920-55/+332
|\ \ \
| * | | Snippets: public/internal/privateValery Sizov2014-10-0920-55/+332
* | | | Merge branch 'bump-grit' into 'master'Dmitriy Zaporozhets2014-10-091-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Bump gitlab-grit version with improved timeout featureDmitriy Zaporozhets2014-10-091-1/+1
|/ / /
* | | Merge branch 'ruby-version' into 'master'Dmitriy Zaporozhets2014-10-091-0/+1
|\ \ \ | |/ / |/| |
| * | set the development ruby version automaticallyJob van der Voort2014-10-091-0/+1
* | | Revert "Up version of html-pipeline-gitlab."Marin Jankovski2014-10-091-3/+2
|/ /
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-081-1/+2
|\ \
| * \ Merge pull request #7986 from liammonahan/masterDmitriy Zaporozhets2014-10-081-1/+2
| |\ \
| | * | Correctly pluralize participants on issue show page.Liam Monahan2014-10-081-1/+2
* | | | Remove border radius because it has wrong backgroundDmitriy Zaporozhets2014-10-081-2/+0
|/ / /
* | | Merge branch 'improve-danger-zone' into 'master'Dmitriy Zaporozhets2014-10-0811-113/+156
|\ \ \
| * | | Restyle colorful panel boxesDmitriy Zaporozhets2014-10-086-40/+33
| * | | Improve project remove specDmitriy Zaporozhets2014-10-081-2/+6
| * | | Apply ConfirmDangerModal for project transfer/remove actionsDmitriy Zaporozhets2014-10-083-7/+22
| * | | ConfirmDangerModal window added. It will be used for confirmation of dangerou...Dmitriy Zaporozhets2014-10-082-0/+42
| * | | show danger settings by defaultDmitriy Zaporozhets2014-10-081-86/+75
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-085-7/+213
|\ \ \ \
| * \ \ \ Merge pull request #7988 from marcaube/patch-1Robert Schilling2014-10-081-1/+4
| |\ \ \ \