Commits · 4d745ff564907e9ecae88b385d2dec63843eb283 · nexedi / gitlab-ce

18 Apr, 2018 13 commits
- Styles for GroupMemberContributions app · 4d745ff5
  Kushal Pandya authored Apr 18, 2018
  
  4d745ff5
- Initialize GroupMemberContributions app · 9e597631
  Kushal Pandya authored Apr 18, 2018
  
  9e597631
- GroupMemberContributions Store · a47ceab1
  Kushal Pandya authored Apr 18, 2018
  
  a47ceab1
- GroupMemberContributions Service · dde2e2bb
  Kushal Pandya authored Apr 18, 2018
  
  dde2e2bb
- GroupMemberContributions Table Body · f9a9e9a2
  Kushal Pandya authored Apr 18, 2018
  
  f9a9e9a2
- GroupMemberContributions Table Header · b4d2709d
  Kushal Pandya authored Apr 18, 2018
  
  b4d2709d
- GroupMemberContributions App Root Component · aff09101
  Kushal Pandya authored Apr 18, 2018
  
  aff09101
- GroupMemberContributions Entry · 56e19ba2
  Kushal Pandya authored Apr 18, 2018
  
  56e19ba2
- GroupMemberContributions App test mock data · 4b6bb507
  Kushal Pandya authored Apr 18, 2018
  
  4b6bb507
- GroupMemberContributions App Constants · aa2e6e56
  Kushal Pandya authored Apr 18, 2018
  
  aa2e6e56
- Remove jQuery Tablesorter plugin · 644d2cef
  Kushal Pandya authored Apr 18, 2018
  
  644d2cef
- Replace contributions table with Vue implementation · 58780d55
  Kushal Pandya authored Apr 18, 2018
  
  58780d55
- Use a serializer to represent Analytics for groups · a97a4905
  Bob Van Landuyt authored Apr 18, 2018
  
  a97a4905
17 Apr, 2018 27 commits
- Merge branch 'fix-geo-add-namespace-weirdness' into 'master' · e50d7588
  Stan Hu authored Apr 17, 2018
```
Avoid creating superfluous namespaces on Geo secondaries during sync

See merge request gitlab-org/gitlab-ee!5378
```
  e50d7588
- Merge branch 'docs-add-badges-ee' into 'master' · 6e58c573
  Gabriel Mazetto authored Apr 17, 2018
```
Docs: add product badges to docs

See merge request gitlab-org/gitlab-ee!5381
```
  6e58c573
- fix typo · 82c2b81f
  Marcia Ramos authored Apr 17, 2018
  
  82c2b81f
- add badges to API/README · 0413574a
  Marcia Ramos authored Apr 17, 2018
  
  0413574a
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into docs-add-badges-ee · ccb9dfd9
  Marcia Ramos authored Apr 17, 2018
  
  ccb9dfd9
- Merge branch 'docs-geo-10-7-fdw' into 'master' · fded3100
  Nick Thomas authored Apr 17, 2018
```
Geo: add extra reconfigure step in docs to enable FDW

See merge request gitlab-org/gitlab-ee!5385
```
  fded3100
- fixes ambiguity · d2842c5a
  Marcia Ramos authored Apr 17, 2018
  
  d2842c5a
- Merge branch 'ce-to-ee-2018-04-17' into 'master' · 84a92916
  Rémy Coutable authored Apr 17, 2018
```
CE upstream - 2018-04-17 00:24 UTC

See merge request gitlab-org/gitlab-ee!5384
```
  84a92916
- update badges guidelines · b6827e46
  Marcia Ramos authored Apr 17, 2018
  
  b6827e46
- Resolve conflict in doc/user/project/web_ide/index.md · 7d98ba83
  Rémy Coutable authored Apr 17, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7d98ba83
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2018-04-17 · 69a11c56
  Rémy Coutable authored Apr 17, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  69a11c56
- fix conflict · f9fcf2ea
  Marcia Ramos authored Apr 17, 2018
  
  f9fcf2ea
- Merge branch 'docs-web-ide-ce-fix-ee' into 'master' · c80329b3
  Marcia Ramos authored Apr 17, 2018
```
Docs: update Web IDE > CE (10.7)

See merge request gitlab-org/gitlab-ee!5395
```
  c80329b3
- Update Web IDE > CE (10.7) · 87679281
  Marcia Ramos authored Apr 17, 2018
  
  87679281
- Keep the same dependencies order in app/assets/javascripts/vue_merge_request_widget/dependencies.js · 750399fa
  Rémy Coutable authored Apr 17, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  750399fa
- ReadyToMergeState needs to be loaded before mrWidgetOptions in... · f393a3a9
  Rémy Coutable authored Apr 17, 2018
```
ReadyToMergeState needs to be loaded before mrWidgetOptions in app/assets/javascripts/vue_merge_request_widget/dependencies.js
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f393a3a9
- Merge branch 'docs-add-badges-ee' of gitlab.com:gitlab-org/gitlab-ee into docs-add-badges-ee · 0834b1d6
  Marcia Ramos authored Apr 17, 2018
  
  0834b1d6
- Web IDE > CE · 493a13a7
  Marcia Ramos authored Apr 17, 2018
  
  493a13a7
- fix conflict · fe132bf3
  Marcia Ramos authored Apr 17, 2018
  
  fe132bf3
- Merge branch 'add-dev-check-back-for-deprecations-ee' into 'master' · 23bf469a
  Rémy Coutable authored Apr 17, 2018
```
Consider dev.gitlab.org for initializing deprecation of Gitlab::GitalyClient::StorageSettings

See merge request gitlab-org/gitlab-ee!5392
```
  23bf469a
- Merge branch 'master' into 'docs-add-badges-ee' · ce2537eb
  Marcia Ramos authored Apr 17, 2018
```
# Conflicts:
#   doc/user/project/index.md
```
  ce2537eb
- Avoid creating superfluous namespaces on Geo secondaries during sync · 870e135b
  Nick Thomas authored Apr 16, 2018
  
  870e135b
- Add .org? method to Gitlab helper · 3e284ae5
  Oswaldo Ferreira authored Apr 17, 2018
```
dev_env_or_com? now considers dev.gitlab.org
```
  3e284ae5
- Resolve conflict in qa/qa/page/merge_request/show.rb · b48bf854
  Rémy Coutable authored Apr 17, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b48bf854
- Resolve conflict in app/assets/javascripts/vue_merge_request_widget/dependencies.js · 2b3c6fa7
  Rémy Coutable authored Apr 17, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2b3c6fa7
- Resolve doc/user/project/web_ide/img/commit_changes.png · ff59893c
  James Ramsay authored Apr 17, 2018
  
  ff59893c
- Resolve doc/user/project/web_ide/index.md · 3dce1bd0
  James Ramsay authored Apr 17, 2018
  
  3dce1bd0