Commit graph

7 commits

Author SHA1 Message Date
Filipa Lacerda
e03c85b981 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
  ...
2018-02-01 17:53:26 +00:00
Robert Speicher
d974ddb70e Merge branch '36009-user-default-project-creator-in-factories' into 'master'
Make user/author use project.creator in most factories

Closes #36009

See merge request gitlab-org/gitlab-ce!13321
2018-02-01 16:11:56 +00:00
Filipa Lacerda
c8a17cd1bd
Update spec to match link being changed into a button 2018-02-01 15:16:34 +00:00
Rémy Coutable
a2718ebaff Make user/author use project.creator in most factories
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-31 18:31:21 +01:00
Takuya Noguchi
2b6307f6ad Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
Nick Thomas
93ea3234df
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' 2018-01-24 17:25:55 +00:00
Rémy Coutable
799cd47109
Improve MR feature specs and reduce duplication
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-18 15:07:57 +01:00