summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-017-7/+44
|\
| * Merge branch 'reporter-manage-issues' into 'master'Dmitriy Zaporozhets2015-07-016-6/+43
| |\
| | * Reporter role can manage issue tracker nowreporter-manage-issuesDmitriy Zaporozhets2015-06-306-6/+43
| * | Merge branch 'k-devise' into 'master'Job van der Voort2015-07-011-1/+1
| |\ \
| | * | fixed notekaren Carias2015-06-301-3/+1
| | * | added note about Devisekaren Carias2015-06-301-0/+2
* | | | Merge branch 'commandline' into 'master'Job van der Voort2015-07-0146-11/+146
|\ \ \ \ | |/ / / |/| | |
| * | | small fixeskaren Carias2015-06-301-3/+1
| * | | organized commandskaren Carias2015-06-302-55/+54
| * | | fixed typokaren Carias2015-06-301-1/+1
| * | | added new linkskaren Carias2015-06-303-6/+6
| * | | renamed files with hyphenkaren Carias2015-06-3045-3/+3
| * | | fixed titlekaren Carias2015-06-291-1/+1
| * | | split to 2 documentskaren Carias2015-06-293-115/+117
| * | | fixed clone wordskaren Carias2015-06-251-4/+4
| * | | added new doc command line commandskaren Carias2015-06-252-0/+136
* | | | Merge branch 'cache-commits-render' into 'master'Dmitriy Zaporozhets2015-07-014-78/+82
|\ \ \ \
| * | | | Use to_reference menthod when render issue id in listDmitriy Zaporozhets2015-07-011-1/+1
| * | | | Cache markdown of commentscache-commits-renderDmitriy Zaporozhets2015-06-301-4/+5
| * | | | Cache issue in the listDmitriy Zaporozhets2015-06-301-36/+37
| * | | | Cache commits listDmitriy Zaporozhets2015-06-301-28/+29
| * | | | Re-use event cache with other users unless its personalDmitriy Zaporozhets2015-06-301-10/+11
* | | | | Merge branch 'rs-fix-application-helper-specs' into 'master'Dmitriy Zaporozhets2015-07-014-106/+144
|\ \ \ \ \
| * | | | | Fix ApplicationHelper specsrs-fix-application-helper-specsRobert Speicher2015-06-303-102/+138
| * | | | | Add spec/support/factory_girlRobert Speicher2015-06-302-4/+6
* | | | | | Merge branch 'rs-issue-1911' into 'master'Robert Speicher2015-07-012-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump Redcarpet to 3.3.2rs-issue-1911Robert Speicher2015-06-302-3/+3
|/ / / / /
* | | | | 7.12 has been releasedJacob Vosmaer2015-06-301-1/+1
* | | | | Merge branch 'reuse-html-pipeline' into 'master'Dmitriy Zaporozhets2015-06-301-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reuse HTML Pipeline object in Markdown parserKamil Trzcinski2015-06-301-2/+2
|/ / / /
* | | | Merge branch 'docker-ci' into 'master'Dmitriy Zaporozhets2015-06-301-1/+1
|\ \ \ \
| * | | | Added missing packages required by docker buildsKamil Trzcinski2015-06-251-1/+1
| |/ / /
* | | | Merge branch 'fix-c-prototype-highlighting' into 'master'Stan Hu2015-06-303-3/+4
|\ \ \ \
| * | | | Bump rugments to v1.0.0beta8 to fix C prototype function highlightingStan Hu2015-06-283-3/+4
* | | | | Merge branch 'doc-style' into 'master'Dmitriy Zaporozhets2015-06-291-17/+18
|\ \ \ \ \
| * | | | | update documentation styleguideJob van der Voort2015-06-291-17/+18
|/ / / / /
* | | | | Merge branch '1791-fix-github-issue-order' into 'master'Stan Hu2015-06-292-1/+4
|\ \ \ \ \
| * | | | | Fix wrong order of issues when importing from githubHiroyuki Sato2015-06-282-1/+4
| |/ / / /
* | | | | Merge branch 'fix-relative-submodule-namespace-path' into 'master'Dmitriy Zaporozhets2015-06-293-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix Error 500 when relative submodule resolves to a namespace that has a diff...Stan Hu2015-06-233-2/+3
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-291-4/+23
|\ \ \ \ \
| * \ \ \ \ Merge branch 'add_to_backup_docs' into 'master'Dmitriy Zaporozhets2015-06-291-4/+23
| |\ \ \ \ \
| | * | | | | Add a troubleshooting section for backup restore docs, explain about warnings...add_to_backup_docsMarin Jankovski2015-06-291-4/+23
| | | |/ / / | | |/| | |
* | | | | | Merge branch 'link-to-saml' into 'master'Job van der Voort2015-06-291-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Link to SAML docs from doc indexJacob Vosmaer2015-06-291-0/+1
|/ / / / /
* | | | | Merge branch 'rs-fix-subscription-feature' into 'master'Dmitriy Zaporozhets2015-06-292-5/+4
|\ \ \ \ \
| * | | | | Attempt to fix the "I should see that I am [un]subscribed" stepsrs-fix-subscription-featureRobert Speicher2015-06-252-5/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs-fuubar' into 'master'Dmitriy Zaporozhets2015-06-293-1/+11
|\ \ \ \ \
| * | | | | Make Fuubar the default rspec formatterrs-fuubarRobert Speicher2015-06-261-0/+1
| * | | | | Add Fuubar gemRobert Speicher2015-06-252-1/+10
| |/ / / /