summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add an index for project_id in project_import_data to improveadd-project-import-data-indexStan Hu2016-11-063-1/+19
* Merge branch 'remove-diff-comments-spec-logging' into 'master' Fatih Acet2016-11-051-1/+0
|\
| * Remove logging to console in diff_comments_store_specwinniehell2016-11-051-1/+0
* | Merge branch 'split-out-markdown-cache-update' into 'master' Yorick Peterse2016-11-051-1/+5
|\ \
| * | Split out markdown cache storage into a separate methodNick Thomas2016-11-041-1/+5
* | | Merge branch 'correct-spelling-andreesen' into 'master' Robert Speicher2016-11-051-1/+1
|\ \ \ | |_|/ |/| |
| * | Correct spelling of Andreesen's namecorrect-spelling-andreesenVictor Wu2016-11-041-1/+1
* | | Merge branch 'move-public-snippets-feature-to-rspec' into 'master' Robert Speicher2016-11-053-35/+19
|\ \ \
| * | | Move spinach public snippet feature to rspec specthe-undefined2016-11-043-35/+19
* | | | Merge branch 'remove-wiki-image-border-radius' into 'master' Fatih Acet2016-11-0411-15/+15
|\ \ \ \
| * | | | Update avatar container name so it doesnt conflict with other image containersremove-wiki-image-border-radiusAnnabel Dunstone Gray2016-11-0311-15/+15
* | | | | Merge branch 'add-special-char-tests-for-refs-dropdown' into 'master' Fatih Acet2016-11-041-1/+13
|\ \ \ \ \
| * | | | | Created wait_for_turbolinks and added test for refs dropdown selection with s...add-special-char-tests-for-refs-dropdownLuke "Jared" Bennett2016-11-041-1/+13
* | | | | | Merge branch 'gitlab-workhorse-1.0.0' into 'master' Rémy Coutable2016-11-043-3/+3
|\ \ \ \ \ \
| * | | | | | Update GitLab Workhorse to v1.0.0Nick Thomas2016-11-043-3/+3
* | | | | | | Merge branch 'add-matches-and-closest-element-extensions' into 'master' Fatih Acet2016-11-041-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Added Element extension with .matches and .closestadd-matches-and-closest-element-extensionsLuke "Jared" Bennett2016-10-311-2/+4
* | | | | | | | Merge branch 'issue-board-new-label-new-list' into 'master' Fatih Acet2016-11-044-0/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Creates new list from a new labelissue-board-new-label-new-listPhil Hughes2016-11-044-0/+35
* | | | | | | | | Merge branch 'fixed-width-caret' into 'master' Fatih Acet2016-11-042-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add width to caret to rid ourselves of the shiftfixed-width-caretJacob Schatz2016-11-042-1/+2
* | | | | | | | | | Merge branch 'stylistic-changes-to-commit-title-bar' into 'master' Fatih Acet2016-11-043-37/+59
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix diff_comments failurestylistic-changes-to-commit-title-barAnnabel Dunstone Gray2016-11-041-1/+1
| * | | | | | | | | | Update commit page stylesAnnabel Dunstone Gray2016-11-042-59/+44
| * | | | | | | | | | Update commit.scss to have correct lintingDimitrie Hoekstra2016-11-041-1/+1
| * | | | | | | | | | added various changes to commit title areaDimitrie Hoekstra2016-11-042-46/+83
* | | | | | | | | | | Merge branch 'issue_23032' into 'master' Sean McGivern2016-11-044-7/+75
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Allow to test JIRA service when project does not have repositoryissue_23032Felipe Artur2016-11-044-7/+75
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'fix/gh-imported-labels-are-not-applied-correctly' into 'master' Sean McGivern2016-11-042-2/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Cache imported GH labels no matter whatfix/gh-imported-labels-are-not-applied-correctlyAhmad Sherif2016-11-041-6/+3
| * | | | | | | | | | Fix applying GitHub-imported labels when importing job is interruptedAhmad Sherif2016-11-042-0/+11
* | | | | | | | | | | Merge branch 'show-status-from-branch' into 'master' Rémy Coutable2016-11-0419-43/+139
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fetch locals to avoid undefined method/local errorshow-status-from-branchLin Jen-Shin2016-11-043-0/+3
| * | | | | | | | | | | Remove author according to the documentLin Jen-Shin2016-11-041-1/+1
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-04109-486/+878
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Update for CHANGELOGLin Jen-Shin2016-11-042-1/+4
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-04145-862/+3070
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | There's no such methodLin Jen-Shin2016-11-041-4/+0
| * | | | | | | | | | | | Initialize @statuses in status rather than constructorLin Jen-Shin2016-11-031-1/+2
| * | | | | | | | | | | | Merge status_for and status, feedback:Lin Jen-Shin2016-11-035-43/+41
| * | | | | | | | | | | | Fix CHANGELOGLin Jen-Shin2016-11-031-22/+1
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-02497-1737/+4374
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Always use multiline in viewLin Jen-Shin2016-10-281-1/+2
| * | | | | | | | | | | | | Add tests for Commit#status and Commit#status_for, feedback:Lin Jen-Shin2016-10-281-1/+44
| * | | | | | | | | | | | | It's not used as a public API right now, feedback:Lin Jen-Shin2016-10-281-5/+4
| * | | | | | | | | | | | | Use multi-line conditions in view, feedback:Lin Jen-Shin2016-10-281-1/+2
| * | | | | | | | | | | | | Also pass ref hereLin Jen-Shin2016-10-271-1/+1
| * | | | | | | | | | | | | Also update for default project page, feedback:Lin Jen-Shin2016-10-273-7/+8
| * | | | | | | | | | | | | Still show status from pipelines, see:Lin Jen-Shin2016-10-273-17/+27
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-2685-380/+1634
| |\ \ \ \ \ \ \ \ \ \ \ \ \