summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Also inject new route helpers into includers of GitlabRoutingHelperdm-routing-helpers-fixDouwe Maan2017-07-082-4/+13
* Merge branch 'dm-mysql-log_bin_trust_function_creators' into 'master'Sean McGivern2017-07-072-1/+25
|\
| * Mention that 9.3 also needs `log_bin_trust_function_creators` on MySQL.dm-mysql-log_bin_trust_function_creatorsDouwe Maan2017-07-072-1/+25
* | Merge branch '30281-report-abusive-content-from-an-issue-or-merge-request' in...Jacob Schatz2017-07-0723-126/+923
|\ \
| * | Fix filters.scss trailing spacesLuke "Jared" Bennett2017-07-071-1/+1
| * | Fix MR and issue specsLuke "Jared" Bennett2017-07-074-15/+18
| * | Fix close_reopen_report_toggle_spec.rb path helpers rubocop offenseLuke "Jared" Bennett2017-07-071-4/+4
| * | Added issuables_helper.js, tidied up droplab-dropdown JS, fixed filtered sear...Luke "Jared" Bennett2017-07-0710-98/+96
| * | Tidy up close_reopen helpers and fix filtered-search-token paddingLuke "Jared" Bennett2017-07-074-23/+41
| * | Fixed issue_spec and merge_request_spec for report toggle changesLuke "Jared" Bennett2017-07-074-28/+26
| * | Fixed MR single button submit failure and attempted to tidy up close_reopen p...Luke "Jared" Bennett2017-07-077-33/+56
| * | Revert parent param removalLuke "Jared" Bennett2017-07-075-9/+11
| * | Dont show toggle if only one action is available and do not show report as ab...Luke "Jared" Bennett2017-07-078-24/+76
| * | Removed merge_request/issue state_event param parent and removed issuable_pat...Luke "Jared" Bennett2017-07-074-34/+20
| * | Remove inclusive JS importsLuke "Jared" Bennett2017-07-076-34/+20
| * | Added specsLuke "Jared" Bennett2017-07-078-11/+472
| * | First UX review changesLuke "Jared" Bennett2017-07-073-20/+13
| * | First FE review changesLuke "Jared" Bennett2017-07-076-35/+45
| * | Added report issuable featureLuke "Jared" Bennett2017-07-0715-82/+349
* | | Merge branch 'rs-issue-34847' into 'master'Douwe Maan2017-07-071-7/+7
|\ \ \
| * | | Mark a subgroup-related spec as PostgreSQL-onlyrs-issue-34847Robert Speicher2017-07-071-7/+7
* | | | Merge branch 'issue-description-gfm' into 'master'Filipa Lacerda2017-07-073-0/+17
|\ \ \ \
| * | | | Fixed GFM references not being included when update issue inlineissue-description-gfmPhil Hughes2017-07-073-0/+17
* | | | | Merge branch '31982-liberation-mono-linux' into 'master'Clement Ho2017-07-072-1/+5
|\ \ \ \ \
| * | | | | Resolve "Liberation Mono weird font rendering on Fedora/openSUSE/other Linux ...Annabel Dunstone Gray2017-07-072-1/+5
|/ / / / /
* | | | | Merge branch 'fix-typo-in-sha-attribute-spec' into 'master'Stan Hu2017-07-071-2/+2
|\ \ \ \ \
| * | | | | Fix another typo in SHA attribute specfix-typo-in-sha-attribute-specStan Hu2017-07-071-1/+1
| * | | | | Fix typo in SHA attribute specSean McGivern2017-07-071-1/+1
* | | | | | Merge branch '20628-add-oauth-implicit-grant' into 'master'Douwe Maan2017-07-073-48/+76
|\ \ \ \ \ \
| * | | | | | #20628 Enable implicit flow in Gitlab as OAuth ProviderMateusz Pytel2017-07-073-48/+76
* | | | | | | Merge branch 'dm-fix-project-path-helpers-production' into 'master'Douwe Maan2017-07-0714-22/+36
|\ \ \ \ \ \ \
| * | | | | | | Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-productionDouwe Maan2017-07-0714-22/+36
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'gitaly-get-blob' into 'master'Sean McGivern2017-07-076-18/+77
|\ \ \ \ \ \ \
| * | | | | | | Add git_blob_load_all_data feature flagJacob Vosmaer2017-07-071-1/+10
| * | | | | | | Add gitaly_git_blob_raw featureJacob Vosmaer2017-07-076-17/+67
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '33929-allow-to-enable-perf-bar-for-a-group' into 'master'Sean McGivern2017-07-0724-44/+469
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'Sean McGivern2017-07-07136-529/+2105
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Fix performance bar specsSean McGivern2017-07-071-5/+10
| * | | | | | | Fix performance bar cookieSean McGivern2017-07-071-1/+1
| * | | | | | | Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-groupSean McGivern2017-07-07238-1060/+3211
| |\ \ \ \ \ \ \
| * | | | | | | | Don't use Flipper for the Performance BarRémy Coutable2017-07-079-164/+119
| * | | | | | | | Allow to enable the Performance Bar for a group from the admin areaRémy Coutable2017-07-0613-54/+257
| * | | | | | | | Use Rails.cache instead of Redis directlyRémy Coutable2017-07-062-31/+8
| * | | | | | | | Improve Features API and its docs and add a Changelog itemRémy Coutable2017-07-066-19/+48
| * | | | | | | | Cache the allowed user IDs for the performance bar, in Redis for 10 minutesRémy Coutable2017-07-062-41/+63
| * | | | | | | | Document the Performance BarRémy Coutable2017-07-065-0/+57
| * | | | | | | | Improve feature flag check for the performance barRémy Coutable2017-07-066-7/+37
| * | | | | | | | Hide 'peek' by using 'performance bar' insteadRémy Coutable2017-07-067-41/+32
| * | | | | | | | Document the feature groupsRémy Coutable2017-07-063-3/+18
| * | | | | | | | Address #34528 by improving the feature flags documentationRémy Coutable2017-07-061-1/+2