Commits · 2c4997a82715886a7a41d312035639e67dbcf4b9 · nexedi / gitlab-ce · GitLab

21 Dec, 2016 11 commits
- Use consistent styles in transition from loading state. · 2c4997a8
  Bryce Johnson authored Dec 21, 2016
  
  2c4997a8
- Re-add tests for Accept Merge Request button. · 4d93b8cb
  Bryce Johnson authored Dec 21, 2016
  
  4d93b8cb
- Shush eslint. · 0c102894
  Bryce Johnson authored Dec 21, 2016
  
  0c102894
- Disable approval buttons during API calls. · c09217e7
  Bryce Johnson authored Dec 21, 2016
  
  c09217e7
- Use standard styles for approvals loading state. · ccf8b725
  Bryce Johnson authored Dec 21, 2016
  
  ccf8b725
- Move script tag content in widget views into ci_bundle. · b3ae4b9a
  Bryce Johnson authored Dec 21, 2016
  
  b3ae4b9a
- Enable JavaScript for Approval Spinach specs. · e315e3ea
  Bryce Johnson authored Dec 21, 2016
  
  e315e3ea
- Remove unused spec for merge button disabled.vi · e93f06b7
  Bryce Johnson authored Dec 21, 2016
  
  e93f06b7
- Add better padding to approvers prefix. · bcbf7f74
  Bryce Johnson authored Dec 21, 2016
  
  bcbf7f74
- Remove unused spec for merge button disabled. · cd1b6acb
  Bryce Johnson authored Dec 21, 2016
  
  cd1b6acb
- Remove spec for merge button hidden, as it shouldn't be. · 40dcae37
  Bryce Johnson authored Dec 21, 2016
  
  40dcae37
20 Dec, 2016 21 commits
- Add slight padding to top of loading state. · fb7f9b93
  Bryce Johnson authored Dec 20, 2016
  
  fb7f9b93
- Remove spinach from teeth. · fd24ec32
  Bryce Johnson authored Dec 20, 2016
  
  fd24ec32
- Merge branch 'approval-integration' of gitlab.com:gitlab-org/gitlab-ee into approval-integration · b20cef65
  Bryce Johnson authored Dec 20, 2016
  
  b20cef65
- Properly enable/disable merge button, fix tests. · 4685ef7f
  Bryce Johnson authored Dec 20, 2016
  
  4685ef7f
- move the API routes back to separate endpoints · 11f2c8a2
  http://jneen.net/ authored Dec 20, 2016
  
  11f2c8a2
- Remove unnecessary 'alert' params passed to Flash constructor. · 434466ec
  Bryce Johnson authored Dec 20, 2016
  
  434466ec
- Remove spec for remove hasApprovers. · 925d5df7
  Bryce Johnson authored Dec 20, 2016
  
  925d5df7
- Shush eslint. · 48ebd782
  Bryce Johnson authored Dec 20, 2016
  
  48ebd782
- Fix build errors related to CI JavaScript. · ce43b3a3
  Bryce Johnson authored Dec 20, 2016
  
  ce43b3a3
- Ensure integration specs wait for approvals load. · 62a6201f
  Bryce Johnson authored Dec 20, 2016
  
  62a6201f
- Import Promise polyfill and fix mockRootStore for approvalsStore spec. · b424f035
  Bryce Johnson authored Dec 20, 2016
  
  b424f035
- Only show stringified suggested users when there are some. · b097a894
  Bryce Johnson authored Dec 20, 2016
  
  b097a894
- Merge branch 'approval-integration' of gitlab.com:gitlab-org/gitlab-ee into approval-integration · c9a5a879
  Bryce Johnson authored Dec 20, 2016
  
  c9a5a879
- Init Flash error message on approval api errors. · f5acfbda
  Bryce Johnson authored Dec 20, 2016
  
  f5acfbda
- Add dividing border to loading state. · b37588bc
  Bryce Johnson authored Dec 20, 2016
  
  b37588bc
- Remove unneeded key quotes in link_to_member_avatar spec. · ad46acb9
  Bryce Johnson authored Dec 20, 2016
  
  ad46acb9
- Update vue_resource lib reference in application.rb · a0709a6c
  Bryce Johnson authored Dec 20, 2016
  
  a0709a6c
- Remove extra newline in merge request scss. · 458ba7ea
  Bryce Johnson authored Dec 20, 2016
  
  458ba7ea
- Do not keep rootEl dataset in memory. · 535fd145
  Bryce Johnson authored Dec 20, 2016
  
  535fd145
- Make icon element clickable. · 02956aab
  Bryce Johnson authored Dec 20, 2016
  
  02956aab
- Remove unused hasApprovers. · ef0f0de0
  Bryce Johnson authored Dec 20, 2016
  
  ef0f0de0
19 Dec, 2016 8 commits
- add a spec for RemoveApprovalService · ad271952
  http://jneen.net/ authored Dec 19, 2016
  
  ad271952
- don't reload the merge request in render_approvals_json · d5869aa3
  http://jneen.net/ authored Dec 19, 2016
```
it's already been done in the relevant service
```
  d5869aa3
- Merge branch 'master' into approval-integration · 0fa3137a
  Bryce Johnson authored Dec 19, 2016
  
  0fa3137a
- Shush Rubocop. · f0792fcd
  Bryce Johnson authored Dec 19, 2016
  
  f0792fcd
- Shush eslint. · 50706345
  Bryce Johnson authored Dec 19, 2016
  
  50706345
- Declare approval component propTypes. · cf05dba2
  Bryce Johnson authored Dec 19, 2016
  
  cf05dba2
- Refactor link_to_member_avatar spec and get passing. · ce155692
  Bryce Johnson authored Dec 19, 2016
  
  ce155692
- Update spec for consistent approver number required. · 3e5aab5d
  Bryce Johnson authored Dec 19, 2016
  
  3e5aab5d