summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Review updatenew-resolvable-discussion-frontendLuke "Jared" Bennett2017-03-215-9/+18
* update droplabLuke "Jared" Bennett2017-03-215-77/+5
* Added droplab toggleLuke "Jared" Bennett2017-03-2111-5/+228
* Update droplabLuke "Jared" Bennett2017-03-214-0/+16
* Updated droplab version to webpack versionLuke "Jared" Bennett2017-03-215-5/+31
* Update droplabnew-resolvable-discussion-frontend-base-from-update-droplab-to-webpack-versionLuke "Jared" Bennett2017-03-215-23/+11
* Updated droplab version to webpack versionLuke "Jared" Bennett2017-03-214-4/+20
* Updated droplab version to webpack versionLuke "Jared" Bennett2017-03-2119-958/+1529
* Add specsDouwe Maan2017-03-2044-297/+1077
* Enable discussions on issues, commits and snippetsDouwe Maan2017-03-201-1/+1
* Better notification emails for notes and (diff) discussionsDouwe Maan2017-03-2026-84/+106
* Fix field nameDouwe Maan2017-03-201-1/+1
* Fix merge conflict issueDouwe Maan2017-03-201-1/+1
* Fix some specsDouwe Maan2017-03-2014-26/+49
* Satisfy RubocopDouwe Maan2017-03-202-2/+2
* Add option to start a new discussion on an MRDouwe Maan2017-03-2076-978/+1320
* Merge branch 'add-filter-focus-style' into 'master' Alfredo Sumaran2017-03-213-4/+52
|\
| * Fix karma testClement Ho2017-03-201-3/+2
| * Add additional check for when inputContainer does not existClement Ho2017-03-201-1/+5
| * Add filter focus for filtered search visual tokensClement Ho2017-03-173-4/+49
* | Merge branch 'perf/add-index-to-user-ghost' into 'master' Douwe Maan2017-03-212-3/+28
|\ \
| * | add an index to the ghost columnhttp://jneen.net/2017-03-202-3/+28
* | | Merge branch 'fix-typos-in-v3-to-v4-doc' into 'master' Douwe Maan2017-03-211-30/+30
|\ \ \
| * | | Make the v3_to_v4.md more consistentRémy Coutable2017-03-201-30/+30
* | | | Merge branch '29671-remove-useless-options' into 'master' Douwe Maan2017-03-211-1/+1
|\ \ \ \
| * | | | Remove useless options from db/fixtures/development/17_cycle_analytics.rbRémy Coutable2017-03-201-1/+1
* | | | | Merge branch 'bugfix/systemhook' into 'master' Douwe Maan2017-03-213-5/+11
|\ \ \ \ \
| * | | | | Fix bug when system hook for deploy keybilly.lb2017-03-163-5/+11
* | | | | | Merge branch 'rs-issue-29592' into 'master' Stan Hu2017-03-212-3/+11
|\ \ \ \ \ \
| * | | | | | Handle Route#name being nil after an updateRobert Speicher2017-03-202-3/+11
* | | | | | | Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-2050-54/+258
|\ \ \ \ \ \ \
| * | | | | | | Merge branch 'render-json-leak' into 'security' DJ Mountney2017-03-204-2/+38
| * | | | | | | Merge branch 'ssrf' into 'security' Rubén Dávila2017-03-201-0/+2
| * | | | | | | Merge branch 'ssrf' into 'security' Douwe Maan2017-03-208-1/+140
| * | | | | | | Merge branch 'fix-links-target-blank' into 'security'Jacob Schatz2017-03-2030-36/+38
| * | | | | | | Merge branch '28058-hide-emails-in-atom-feeds' into 'security'Rémy Coutable2017-03-207-15/+25
| * | | | | | | Update CHANGELOG.md for 8.17.4James Lopez2017-03-191-0/+5
| * | | | | | | Update CHANGELOG.md for 8.16.8James Lopez2017-03-191-0/+5
| * | | | | | | Update CHANGELOG.md for 8.15.8James Lopez2017-03-191-0/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '29730-9-0-upgrade-documentation-should-include-yarn' into 'mast...Filipa Lacerda2017-03-211-4/+4
|\ \ \ \ \ \ \
| * | | | | | | fix recompile assets step in 9.0 upgrade guide to use yarnMike Greiling2017-03-201-4/+4
* | | | | | | | Merge branch 'clear-page-param-after-filter-in-add-issues-modal' into 'master' Alfredo Sumaran2017-03-211-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Reset issue boards add issues modal page when filteringclear-page-param-after-filter-in-add-issues-modalPhil Hughes2017-03-171-0/+4
* | | | | | | | | Merge branch 'token-bug-fixes' into 'master'Clement Ho2017-03-201-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update css to be nice and tidy.Jacob Schatz2017-03-201-2/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'reset-filters-after-click' into 'master' Alfredo Sumaran2017-03-202-1/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reset filters after clickClement Ho2017-03-202-1/+22
|/ / / / / / / / /
* | | | | | | | | Merge branch '28499-fix-large-text-tooltip-in-diff-file-name' into 'master' Filipa Lacerda2017-03-202-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixes large text tooltip in diff file nameNur Rony2017-03-202-0/+10
* | | | | | | | | | Merge branch '28660-fix-dismissable-error-close-not-visible-enough' into 'mas...Filipa Lacerda2017-03-202-0/+16
|\ \ \ \ \ \ \ \ \ \