summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix border color.bug/jschatz1/file-browser-linesJacob Schatz2016-01-261-0/+1
* Revert "Styles for file list change."Jacob Schatz2016-01-264-36/+37
* Revert "Adjusts styles of table tree"Jacob Schatz2016-01-262-34/+10
* Adjusts styles of table treeJacob Schatz2016-01-262-10/+34
* Styles for file list change.Jacob Schatz2016-01-264-37/+36
* Merge branch 'rs-issue-12677' into 'master' Douwe Maan2016-01-262-1/+10
|\
| * Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677Robert Speicher2016-01-242-1/+10
* | Merge branch 'rs-groups-index' into 'master' Douwe Maan2016-01-262-4/+28
|\ \
| * | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-232-4/+28
* | | Merge branch 'patch-1' into 'master' Stan Hu2016-01-261-5/+7
|\ \ \
| * | | Update Slack integration configurationMarcin Zajączkowski2016-01-251-5/+7
* | | | Update CHANGELOGRobert Speicher2016-01-251-0/+6
* | | | Merge branch 'fix-import-redirect-loop' into 'master' Robert Speicher2016-01-262-5/+124
|\ \ \ \
| * | | | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-252-5/+124
* | | | | Merge branch 'instrumentation-signature' into 'master' Douglas Barbosa Alexandre2016-01-262-3/+29
|\ \ \ \ \
| * | | | | Correct arity for instrumented methods w/o argsinstrumentation-signatureYorick Peterse2016-01-252-3/+29
| |/ / / /
* | | | | Merge branch 'note-highlighting' into 'master' Robert Speicher2016-01-2516-64/+34
|\ \ \ \ \
| * | | | | Highlight note code and edit previewnote-highlightingDouwe Maan2016-01-2516-64/+34
* | | | | | Merge branch 'rs-rails-security' into 'master' Robert Speicher2016-01-253-35/+42
|\ \ \ \ \ \
| * | | | | | Add temporary monkey patch to get specs passing on 4.2.5.1Robert Speicher2016-01-251-0/+6
| * | | | | | Update rails, rails-html-sanitizer, and nokogiri for security fixesrs-rails-securityRobert Speicher2016-01-252-35/+36
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'doc_refactor_jira' into 'master' Achilleas Pipinellis2016-01-2523-151/+217
|\ \ \ \ \ \
| * | | | | | Add minimum required GitLab versionAchilleas Pipinellis2016-01-251-3/+6
| * | | | | | Remove old JIRA referenceAchilleas Pipinellis2016-01-252-52/+2
| * | | | | | Fix typos, grammar and stylingAchilleas Pipinellis2016-01-253-19/+14
| * | | | | | Add proper screenshot and comment on the outputdoc_refactor_jiraAchilleas Pipinellis2016-01-253-5/+14
| * | | | | | Fix sub-headingAchilleas Pipinellis2016-01-251-1/+1
| * | | | | | JIRA doc clean-up [ci skip]Achilleas Pipinellis2016-01-255-50/+94
| * | | | | | Add steps on configuring JIRAAchilleas Pipinellis2016-01-257-13/+62
| * | | | | | Split JIRA configuration for GitLab < 7.8 and > 7.8Achilleas Pipinellis2016-01-252-0/+162
| * | | | | | Move JIRA from integration to project_servicesAchilleas Pipinellis2016-01-2511-151/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'mention_rouge_in_docs' into 'master' Sytse Sijbrandij2016-01-252-0/+10
|\ \ \ \ \ \
| * | | | | | Add references to the rouge gem libraryAchilleas Pipinellis2016-01-252-0/+10
* | | | | | | Merge branch 'prioritize-previewable-over-plain-readmes' into 'master' Robert Speicher2016-01-252-4/+76
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Prioritize previewable over plain README filesprioritize-previewable-over-plain-readmesDouglas Barbosa Alexandre2016-01-252-4/+76
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rm-depr-forum-promolink' into 'master' Robert Speicher2016-01-251-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Substituted deprecated forum link with project issues link. [ci skip]Jose Torres2016-01-251-3/+3
|/ / / / /
* | | | | Merge branch 'top-search-colors-and-element-position-is-not-like-in-design' i...Jacob Schatz2016-01-258-20/+50
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Border radius to vars.top-search-colors-and-element-position-is-not-like-in-designJacob Schatz2016-01-242-6/+10
| * | | | Distinguishes between search inputs.Jacob Schatz2016-01-242-7/+7
| * | | | Removes extra spacesJacob Schatz2016-01-241-2/+0
| * | | | Make base64 image smaller by 5000 characters.Jacob Schatz2016-01-241-2/+1
| * | | | Adds base64 background search icon.Jacob Schatz2016-01-247-15/+44
| |/ / /
* | | | Merge branch 'rails_update' into 'master' Valery Sizov2016-01-252-31/+31
|\ \ \ \
| * | | | rails updated to 4.2.5rails_updateValery Sizov2016-01-252-31/+31
| |/ / /
* | | | Merge branch 'install-unzip' into 'master' Kamil Trzciński2016-01-251-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Install unzip in build environment [ci skip]Kamil Trzcinski2016-01-251-1/+1
|/ / /
* | | Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-01-253-2/+22
|\ \ \ | |/ / |/| |
| * | Use branch_count in Repository#has_visible_content?Yorick Peterse2016-01-212-1/+21
| * | Updated gitlab_git to 7.2.24Yorick Peterse2016-01-211-1/+1