summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / /
* | | | Merge branch 'rs-disables-submit-behavior' into 'master'Dmitriy Zaporozhets2015-06-2923-55/+131
|\ \ \ \
| * | | | Remove requires-input from the Network Graph formrs-disables-submit-behaviorRobert Speicher2015-06-261-2/+2
| * | | | Fix "Project Forked Merge Requests" scenarioRobert Speicher2015-06-261-1/+0
| * | | | Remove duplicate 'required: true' attributeRobert Speicher2015-06-261-1/+1
| * | | | Remove disableButtonIf[Any]EmptyField calls from formsRobert Speicher2015-06-2618-55/+26
| * | | | Add "Requires Input" JS behaviorRobert Speicher2015-06-263-0/+106
| | |/ / | |/| |
* | | | Merge branch 'rs-update-gitlab-ci' into 'master'Dmitriy Zaporozhets2015-06-292-14/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Remove jasmine:ci task, execute teaspoon directly on CIrs-update-gitlab-ciRobert Speicher2015-06-282-14/+2
|/ / /
* | | Merge branch 'rename-abilities' into 'master'Dmitriy Zaporozhets2015-06-2633-88/+101
|\ \ \
| * | | Refactor issue, mr, note abilities to include project abilities tooDmitriy Zaporozhets2015-06-261-13/+30
| * | | Change dynamic abilities to new formatDmitriy Zaporozhets2015-06-262-13/+9
| * | | Update controller filtersDmitriy Zaporozhets2015-06-266-13/+13
| * | | Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-2631-53/+53
* | | | Merge branch 'rs-issue-1887' into 'master'Dmitriy Zaporozhets2015-06-264-28/+27
|\ \ \ \
| * | | | Fix merge request diff featuresrs-issue-1887Robert Speicher2015-06-253-23/+16
| * | | | Trigger sticky_kit:recalc when diffs are pre-loadedRobert Speicher2015-06-251-3/+9
| * | | | Reorder MergeRequestTabs constructorRobert Speicher2015-06-251-3/+3
| | |/ / | |/| |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-2643-247/+203
|\ \ \ \
| * \ \ \ Merge branch 'permission-improvements' into 'master'Dmitriy Zaporozhets2015-06-2643-247/+203
| |\ \ \ \
| | * | | | Only people who can manage issue can assign labels to itpermission-improvementsDmitriy Zaporozhets2015-06-261-1/+1
| | * | | | Use page.within in testsDmitriy Zaporozhets2015-06-261-3/+3
| | | |/ / | | |/| |
| | * | | Simplify set of assignee, milestone and label to admin_issue ruleDmitriy Zaporozhets2015-06-267-27/+8
| | * | | Update tests and use js-issuable class for context formDmitriy Zaporozhets2015-06-268-11/+11
| | * | | UsersSelect is part of filter so I rather keep js executed in partialDmitriy Zaporozhets2015-06-252-7/+2
| | * | | Write test for submitting issue as guestDmitriy Zaporozhets2015-06-252-0/+30
| | * | | Fix js error on merge request pageDmitriy Zaporozhets2015-06-251-1/+0