diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-01 17:53:26 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-01 17:53:26 +0000 |
| commit | e03c85b98154b0515ef563205ca1f44432941836 (patch) | |
| tree | c849e6cd6317d3aee7648b7d6cd48a6ebbc2057c /lib/api/helpers | |
| parent | 3fed0302cb383ca3714c2fc540ac777409020862 (diff) | |
| parent | 402f3dfc0a962dc89d8334d4d61410e67e14a55f (diff) | |
| download | gitlab-ce-e03c85b98154b0515ef563205ca1f44432941836.tar.gz | |
Merge branch 'master' into fl-mr-widget-1
* master: (38 commits)
Added more tests and corrected typos
Ban Rugged from Repository
Improve doc/development/automatic_ce_ee_merge.md
fixed infinite loop crashing tests
Converted todos.js to axios
Converted usage_ping.js to use axios
Converted pager.js to axios
Converted notifications_form.js to axios
Converted notes.js to axios
Converted branch_graph.js to axios
Converted mini_pipeline_graph_dropdown.js to axios
Include subgroup issuables on the group page
Remove grpc and google-protobuf platform-specific version markers in Gemfile.lock
Replace $.ajax in find file with axios
Replace $.ajax in activity calendar with axios
Remove namespaced internationalization import
Fix subgroup creation docs
Fix a JSON schema that doesn't include enough fields
Make user/author use project.creator in most factories
Enable RuboCop Style/RegexpLiteral
...
Diffstat (limited to 'lib/api/helpers')
0 files changed, 0 insertions, 0 deletions