summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Address review commentsDouwe Maan2017-04-0540-401/+504
* Fix specsDouwe Maan2017-04-0515-585/+576
* Address review commentsDouwe Maan2017-04-0528-128/+97
* Correctly display multiple separate discussions on the same diff lineDouwe Maan2017-04-0514-65/+64
* Don't use original_discussion_idDouwe Maan2017-04-0525-183/+47
* Extract commonalities between DiffDiscussion and LegacyDiffDiscussionDouwe Maan2017-04-059-164/+162
* Fix specsDouwe Maan2017-04-0512-13/+13
* Add specsDouwe Maan2017-04-0544-297/+1077
* Enable discussions on issues, commits and snippetsDouwe Maan2017-04-051-1/+1
* Better notification emails for notes and (diff) discussionsDouwe Maan2017-04-0526-84/+106
* Fix field nameDouwe Maan2017-04-051-1/+1
* Fix merge conflict issueDouwe Maan2017-04-051-1/+1
* Fix some specsDouwe Maan2017-04-0511-22/+45
* Satisfy RubocopDouwe Maan2017-04-052-2/+2
* Add option to start a new discussion on an MRDouwe Maan2017-04-0576-982/+1323
* Prep for moving droplab to npmLuke "Jared" Bennett2017-04-0512-2052/+539
* update droplabLuke "Jared" Bennett2017-04-0510-341/+299
* Updated droplab version to webpack versionLuke "Jared" Bennett2017-04-0518-884/+1533
* Merge branch 'emoji-menu-duplicated-search-icon' into 'master' Filipa Lacerda2017-04-052-2/+6
|\
| * Removes the duplicated search icon in emoji menuemoji-menu-duplicated-search-iconPhil Hughes2017-04-052-2/+6
* | Merge branch 'render-pdfs-in-gitlab' into 'master' Jacob Schatz2017-04-0513-1/+51299
|\ \
| * | Use PDFLab to render PDFs in GitLabSam Rose2017-04-0513-1/+51299
|/ /
* | Merge branch 'docs-polling-query-params' into 'master' Sean McGivern2017-04-051-0/+6
|\ \
| * | Document how ETag caching middleware handles query parametersAdam Niedzielski2017-04-051-0/+6
* | | Merge branch 'wildcard-routes-in-etag-middleware' into 'master' Sean McGivern2017-04-051-1/+1
|\ \ \
| * | | Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middlewarewildcard-routes-in-etag-middlewareAdam Niedzielski2017-04-051-1/+1
| |/ /
* | | Merge branch 'sh-fix-award-emoji-transient-spec' into 'master' Rémy Coutable2017-04-051-1/+3
|\ \ \
| * | | Potential fix for intermittent spec failure in award emoji specssh-fix-award-emoji-transient-specStan Hu2017-04-051-1/+3
| | |/ | |/|
* | | Merge branch 'sketch-preview-files' into 'master' Jacob Schatz2017-04-0511-2/+293
|\ \ \
| * | | Load a preview of Sketch 43 filessketch-preview-filesJacob Schatz2017-04-0511-2/+293
* | | | Merge branch 'fix-groups-long-url' into 'master' Jacob Schatz2017-04-052-2/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make group skip validation in the frontendAlfredo Sumaran2017-04-052-2/+6
|/ / /
* | | Merge branch '20841-getting-started-better-empty-state-for-merge-requests-vie...Jacob Schatz2017-04-0520-40/+213
|\ \ \
| * | | MR empty stateLuke "Jared" Bennett2017-04-0520-40/+213
|/ / /
* | | Merge branch 'gitlab-ci-multi-runner-2284' into 'master' Rémy Coutable2017-04-052-0/+29
|\ \ \
| * | | Return an empty array when dependencies is an empty arrayMike Wyatt2017-04-052-0/+29
|/ / /
* | | Merge branch 'mock-deployments' into 'master' Rémy Coutable2017-04-0510-2/+124
|\ \ \
| * | | Added mock deployment and monitoring service with environments fixturesKamil Trzciński2017-04-0510-2/+124
|/ / /
* | | Merge branch 'issue-boards-list-template-in-js' into 'master' Filipa Lacerda2017-04-056-140/+382
|\ \ \
| * | | Changed order in Vue filePhil Hughes2017-04-051-77/+78
| * | | Added specs for board list componentPhil Hughes2017-04-053-6/+210
| * | | Issue boards list template in JS filePhil Hughes2017-04-055-138/+175
| | |/ | |/|
* | | Merge branch 'fix/import-namespace' into 'master' Sean McGivern2017-04-055-12/+212
|\ \ \ | |/ / |/| |
| * | Create subgroups if they don't exist while importing projectsJames Lopez2017-04-055-12/+212
|/ /
* | Merge branch 'fix_wiki_commit_message' into 'master' Sean McGivern2017-04-054-1/+33
|\ \
| * | Fix wiki commit messageblackst0ne2017-04-054-1/+33
* | | Merge branch 'issue_91_ee_backport' into 'master'Sean McGivern2017-04-053-12/+4
|\ \ \ | |_|/ |/| |
| * | Do not set closed_at to nil when issue is reopenedissue_91_ee_backportFelipe Artur2017-04-043-12/+4
* | | Merge branch 'sh-fix-ssh-keys-with-spaces' into 'master' Sean McGivern2017-04-053-1/+14
|\ \ \
| * | | Handle SSH keys that have multiple spaces between each markerStan Hu2017-04-043-1/+14