| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Also inject new route helpers into includers of GitlabRoutingHelperdm-routing-helpers-fix | Douwe Maan | 2017-07-08 | 2 | -4/+13 |
| | | |||||
| * | Merge branch 'dm-mysql-log_bin_trust_function_creators' into 'master' | Sean McGivern | 2017-07-07 | 2 | -1/+25 |
| |\ | | | | | | | | | Mention that 9.3 also needs `log_bin_trust_function_creators` on MySQL. See merge request !12687 | ||||
| | * | Mention that 9.3 also needs `log_bin_trust_function_creators` on MySQL.dm-mysql-log_bin_trust_function_creators | Douwe Maan | 2017-07-07 | 2 | -1/+25 |
| | | | |||||
| * | | Merge branch '30281-report-abusive-content-from-an-issue-or-merge-request' ↵ | Jacob Schatz | 2017-07-07 | 23 | -126/+923 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Report abusive content from an issue or merge request" Closes #30281 See merge request !11786 | ||||
| | * | | Fix filters.scss trailing spaces | Luke "Jared" Bennett | 2017-07-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix MR and issue specs | Luke "Jared" Bennett | 2017-07-07 | 4 | -15/+18 |
| | | | | |||||
| | * | | Fix close_reopen_report_toggle_spec.rb path helpers rubocop offense | Luke "Jared" Bennett | 2017-07-07 | 1 | -4/+4 |
| | | | | |||||
| | * | | Added issuables_helper.js, tidied up droplab-dropdown JS, fixed filtered ↵ | Luke "Jared" Bennett | 2017-07-07 | 10 | -98/+96 |
| | | | | | | | | | | | | | search specs | ||||
| | * | | Tidy up close_reopen helpers and fix filtered-search-token padding | Luke "Jared" Bennett | 2017-07-07 | 4 | -23/+41 |
| | | | | |||||
| | * | | Fixed issue_spec and merge_request_spec for report toggle changes | Luke "Jared" Bennett | 2017-07-07 | 4 | -28/+26 |
| | | | | |||||
| | * | | Fixed MR single button submit failure and attempted to tidy up close_reopen ↵ | Luke "Jared" Bennett | 2017-07-07 | 7 | -33/+56 |
| | | | | | | | | | | | | | partials using issuable_helpers and setDisable will use true as default bool | ||||
| | * | | Revert parent param removal | Luke "Jared" Bennett | 2017-07-07 | 5 | -9/+11 |
| | | | | |||||
| | * | | Dont show toggle if only one action is available and do not show report as ↵ | Luke "Jared" Bennett | 2017-07-07 | 8 | -24/+76 |
| | | | | | | | | | | | | | abuse for current_user's issuables | ||||
| | * | | Removed merge_request/issue state_event param parent and removed ↵ | Luke "Jared" Bennett | 2017-07-07 | 4 | -34/+20 |
| | | | | | | | | | | | | | issuable_path helpers in favour of issuable_url helpers | ||||
| | * | | Remove inclusive JS imports | Luke "Jared" Bennett | 2017-07-07 | 6 | -34/+20 |
| | | | | |||||
| | * | | Added specs | Luke "Jared" Bennett | 2017-07-07 | 8 | -11/+472 |
| | | | | |||||
| | * | | First UX review changes | Luke "Jared" Bennett | 2017-07-07 | 3 | -20/+13 |
| | | | | |||||
| | * | | First FE review changes | Luke "Jared" Bennett | 2017-07-07 | 6 | -35/+45 |
| | | | | |||||
| | * | | Added report issuable feature | Luke "Jared" Bennett | 2017-07-07 | 15 | -82/+349 |
| | | | | |||||
| * | | | Merge branch 'rs-issue-34847' into 'master' | Douwe Maan | 2017-07-07 | 1 | -7/+7 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Mark a subgroup-related spec as PostgreSQL-only Closes #34847 See merge request !12722 | ||||
| | * | | | Mark a subgroup-related spec as PostgreSQL-onlyrs-issue-34847 | Robert Speicher | 2017-07-07 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34847 | ||||
| * | | | | Merge branch 'issue-description-gfm' into 'master' | Filipa Lacerda | 2017-07-07 | 3 | -0/+17 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed GFM references not being included when update issue inline Closes gitlab-ee#2878 See merge request !12720 | ||||
| | * | | | | Fixed GFM references not being included when update issue inlineissue-description-gfm | Phil Hughes | 2017-07-07 | 3 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/2878 | ||||
| * | | | | | Merge branch '31982-liberation-mono-linux' into 'master' | Clement Ho | 2017-07-07 | 2 | -1/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Liberation Mono weird font rendering on Fedora/openSUSE/other Linux distros" Closes #31982 See merge request !12718 | ||||
| | * | | | | | Resolve "Liberation Mono weird font rendering on Fedora/openSUSE/other Linux ↵ | Annabel Dunstone Gray | 2017-07-07 | 2 | -1/+5 |
| |/ / / / / | | | | | | | | | | | | | | | | distros" | ||||
| * | | | | | Merge branch 'fix-typo-in-sha-attribute-spec' into 'master' | Stan Hu | 2017-07-07 | 1 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in SHA attribute spec See merge request !12717 | ||||
| | * | | | | | Fix another typo in SHA attribute specfix-typo-in-sha-attribute-spec | Stan Hu | 2017-07-07 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Fix typo in SHA attribute spec | Sean McGivern | 2017-07-07 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch '20628-add-oauth-implicit-grant' into 'master' | Douwe Maan | 2017-07-07 | 3 | -48/+76 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #20628 Enable implicit flow in Gitlab as OAuth Provider Closes #20628, #2716, and #19470 See merge request !12384 | ||||
| | * | | | | | | #20628 Enable implicit flow in Gitlab as OAuth Provider | Mateusz Pytel | 2017-07-07 | 3 | -48/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #20628 by re-enabling implicit grant in Doorkeeper config. OAuth2 documentation refactored. | ||||
| * | | | | | | | Merge branch 'dm-fix-project-path-helpers-production' into 'master' | Douwe Maan | 2017-07-07 | 14 | -22/+36 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include new URL helpers retroactively into includers of Gitlab::Routing Closes #34821 See merge request !12716 | ||||
| | * | | | | | | | Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-production | Douwe Maan | 2017-07-07 | 14 | -22/+36 |
| | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'gitaly-get-blob' into 'master' | Sean McGivern | 2017-07-07 | 6 | -18/+77 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gitaly_git_blob_raw feature See merge request !12712 | ||||
| | * | | | | | | | Add git_blob_load_all_data feature flag | Jacob Vosmaer | 2017-07-07 | 1 | -1/+10 |
| | | | | | | | | | |||||
| | * | | | | | | | Add gitaly_git_blob_raw feature | Jacob Vosmaer | 2017-07-07 | 6 | -17/+67 |
| | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch '33929-allow-to-enable-perf-bar-for-a-group' into 'master' | Sean McGivern | 2017-07-07 | 24 | -44/+469 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to enable the performance bar per user or Feature group Closes #33929 and #34528 See merge request !12362 | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group' | Sean McGivern | 2017-07-07 | 136 | -529/+2105 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | | | | | | | Fix performance bar specs | Sean McGivern | 2017-07-07 | 1 | -5/+10 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix performance bar cookie | Sean McGivern | 2017-07-07 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-group | Sean McGivern | 2017-07-07 | 238 | -1060/+3211 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Don't use Flipper for the Performance Bar | Rémy Coutable | 2017-07-07 | 9 | -164/+119 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation now simply rely on the `performance_bar_allowed_group_id` Application Setting. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | Allow to enable the Performance Bar for a group from the admin area | Rémy Coutable | 2017-07-06 | 13 | -54/+257 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | Use Rails.cache instead of Redis directly | Rémy Coutable | 2017-07-06 | 2 | -31/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | Improve Features API and its docs and add a Changelog item | Rémy Coutable | 2017-07-06 | 6 | -19/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | Cache the allowed user IDs for the performance bar, in Redis for 10 minutes | Rémy Coutable | 2017-07-06 | 2 | -41/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | Document the Performance Bar | Rémy Coutable | 2017-07-06 | 5 | -0/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | Improve feature flag check for the performance bar | Rémy Coutable | 2017-07-06 | 6 | -7/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | Hide 'peek' by using 'performance bar' instead | Rémy Coutable | 2017-07-06 | 7 | -41/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | Document the feature groups | Rémy Coutable | 2017-07-06 | 3 | -3/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | Address #34528 by improving the feature flags documentation | Rémy Coutable | 2017-07-06 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |