delta/gitlab/gitlab-ce.git/spec/javascripts, branch docs-add-api-params-array-hash gitlab.com: gitlab-org/gitlab-ce.git Revert "Merge branch 'ee-5481-epic-todos' into 'master'" 2018-07-11T16:33:24+00:00 Jarka Kadlecová jarka@gitlab.com 2018-07-11T16:33:24+00:00 8717c7dad9b5a8fa21ec9a652c54718a6b4c2175 This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489. 
This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing
changes made to ecf9c145f6e4d170cd059df88743393d9e63c489.
Merge branch '48237-toggle-file-comments' into 'master' 2018-07-11T15:59:25+00:00 Phil Hughes me@iamphill.com 2018-07-11T15:59:25+00:00 7bebf9833df83afdb4a83ea5a9c73e9e22225c6e Resolve "Toggle file comments in merge request does not update toggle buttons" Closes #48237 and #48537 See merge request gitlab-org/gitlab-ce!20452 
Resolve "Toggle file comments in merge request does not update toggle buttons"

Closes #48237 and #48537

See merge request gitlab-org/gitlab-ce!20452
 Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11T14:36:08+00:00 Mark Chao mchao@gitlab.com 2018-07-11T14:36:08+00:00 a63bce1a4b55bc6cbafb9dec12d33028521489e9 






Adds specs for toggleFileDiscussions action
2018-07-11T14:30:41+00:00

Filipa Lacerda
filipa@gitlab.com

2018-07-11T14:30:41+00:00

c5a514de767f1d6b66443552bdc16d09370d9d07












Adds specs for getters in merge request vuex diff module
2018-07-11T11:48:24+00:00

Filipa Lacerda
filipa@gitlab.com

2018-07-11T11:43:51+00:00

57c32c7dbdd470b1ea31edf412e8bb0aa6261e21












Mock timeouts and Promise in SmartInterval tests
2018-07-10T19:28:14+00:00

Winnie Hellmann
winnie@gitlab.com

2018-07-10T19:28:14+00:00

66ad04e40ce13be3ce90c69e6449160ac12f73d4












Merge branch 'master' into 48237-toggle-file-comments
2018-07-10T17:11:19+00:00

Filipa Lacerda
filipa@gitlab.com

2018-07-10T11:05:06+00:00

135ead1d83d774a1bc0ed3ed947896b64d1755aa

* master: (38 commits)
  Update bitbucket.md to fix typo and small grammar touchups.
  Update time_helper.rb to fix output for exact minutes.
  Document update for GitLab Pages users.
  Support manually stopping any environment from the UI
  Fix link to frontend in handbook
  Shorten CHANGELOG filename to avoid breaking ecryptfs users
  Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml
  Fix mountComponent helper path in docs
  Fix #48537 - Update avatar only via the projects API
  Add additional headline for Adding SSH keys to GitLab
  Request to be a proofreader.
  Fix specs
  Fix search bar text input alignment
  Fix API docs on unauthenticated projects return
  Adds with_projects optional parameter to /groups/:id API endpoint
  Docs: make it clear that you need a completely separate domain for Pages
  Document that we don't want to wait in tests
  Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor
  Remove useless return
  Use latest gitlab-styles
  ...





* master: (38 commits)
  Update bitbucket.md to fix typo and small grammar touchups.
  Update time_helper.rb to fix output for exact minutes.
  Document update for GitLab Pages users.
  Support manually stopping any environment from the UI
  Fix link to frontend in handbook
  Shorten CHANGELOG filename to avoid breaking ecryptfs users
  Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml
  Fix mountComponent helper path in docs
  Fix #48537 - Update avatar only via the projects API
  Add additional headline for Adding SSH keys to GitLab
  Request to be a proofreader.
  Fix specs
  Fix search bar text input alignment
  Fix API docs on unauthenticated projects return
  Adds with_projects optional parameter to /groups/:id API endpoint
  Docs: make it clear that you need a completely separate domain for Pages
  Document that we don't want to wait in tests
  Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor
  Remove useless return
  Use latest gitlab-styles
  ...







Support manually stopping any environment from the UI
2018-07-10T08:11:04+00:00

Winnie Hellmann
winnie@gitlab.com

2018-07-10T08:11:04+00:00

d79cef3a9a5577765d975326fbf4bc1b8c5634de












Merge branch '48951-clean-up' into 'master'
2018-07-10T07:38:48+00:00

Phil Hughes
me@iamphill.com

2018-07-10T07:38:48+00:00

ca1deb9e5ec1429a65d73b3352d1207301f9fc6f

Resolve "MR refactor: All actions under diff module are being exported twice"

Closes #48951

See merge request gitlab-org/gitlab-ce!20499




Resolve "MR refactor: All actions under diff module are being exported twice"

Closes #48951

See merge request gitlab-org/gitlab-ce!20499






Removes unused store in diffs mr refactor
2018-07-09T14:46:36+00:00

Filipa Lacerda
filipa@gitlab.com

2018-07-09T14:40:48+00:00

8186bb39031b189396b57def9de202ddf65cbcbb

Removes double export for actions in diffs module in mr refactor





Removes double export for actions in diffs module in mr refactor