summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Hide ancestor groups in the share group dropdown listdz-hide-share-group-ancestorsDmitriy Zaporozhets2017-03-214-2/+29
* Merge branch 'sh-fix-admin-application-settings' into 'master' Robert Speicher2017-03-215-2/+67
|\
| * Undo explicit conversion to IntegerToon Claes2017-03-202-12/+28
| * Make level_value accept string integersToon Claes2017-03-202-2/+23
| * Make feature spec more robustToon Claes2017-03-201-2/+1
| * Fix Error 500 when application settings are savedStan Hu2017-03-183-0/+29
* | 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | dismissable error close is not visible enough28660-fix-dismissable-error-close-not-visible-enoughNur Rony2017-03-022-0/+16
* | | | | | | | | | | | Merge branch '29559-issue-count' into 'master' Filipa Lacerda2017-03-202-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | handle commas in Issue total countSimon Knox2017-03-212-3/+20
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'make-karma-fast-again' into 'master' Alfredo Sumaran2017-03-208-68/+119
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Only add frontend code coverage instrumentation when generating coverage reportMike Greiling2017-03-208-68/+119
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '29491-rename-file-for-group-name-toggle' into 'master' Alfredo Sumaran2017-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Append _spec to group_name_toggle spec fileSam Rose2017-03-171-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'simplify-docs-trigger' into 'master' Achilleas Pipinellis2017-03-202-1/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fail trigger_docs if triggering build was not successfulwinniehell2017-03-201-1/+2
| * | | | | | | | | | | Simplify trigger_docs build job for CE and EE (!9820)winniehell2017-03-202-1/+6