Commits · 3f5d5001592eb932bfa5e8574843844fe3508539 · nexedi / gitlab-ce

17 Mar, 2017 1 commit
- Use EE master for gl_dropdown · 3f5d5001
  Phil Hughes authored Mar 17, 2017
  
  3f5d5001
16 Mar, 2017 1 commit
- Fix conflicts in environments code · 7e052b0a
  Filipa Lacerda authored Mar 16, 2017
  
  7e052b0a
15 Mar, 2017 37 commits
- Fix conflicts in specs · 106e288b
  Rémy Coutable authored Mar 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  106e288b
- Fix misc conflicts · 2dd4167d
  Rémy Coutable authored Mar 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2dd4167d
- Fix conflict in initializer · 13acd6fe
  Rémy Coutable authored Mar 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  13acd6fe
- Fix conflicts in views · 97ef44b5
  Rémy Coutable authored Mar 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  97ef44b5
- Fix conflict in .gitlab-ci.yml · 9da17eb1
  Rémy Coutable authored Mar 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9da17eb1
- Fix conflicts in JS · 7d471af7
  Rémy Coutable authored Mar 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7d471af7
- Merge remote-tracking branch 'ce/master' into rc/ce-to-ee-wednesday · 839279f0
  Rémy Coutable authored Mar 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  839279f0
- Revert "Merge branch '27376-cache-default-branch-pipeline-on-project-ee' into 'master'" · a0b78db4
  Yorick Peterse authored Mar 15, 2017
```
This reverts merge request !1426
```
  a0b78db4
- Merge branch '27376-cache-default-branch-pipeline-on-project-ee' into 'master' · ba137f20
  Yorick Peterse authored Mar 15, 2017
```
Port of 27376-cache-default-branch-pipeline-on-project to EE

See merge request !1426
```
  ba137f20
- Merge branch '1164-fix-rake-gitlab-env-info' into 'master' · 36f8dbd3
  Sean McGivern authored Mar 15, 2017
```
Fix rake gitlab:env:info elasticsearch datum

Closes #1164

See merge request !1422
```
  36f8dbd3
- Merge branch 'docs/nested-groups' into 'master' · 6619772f
  Achilleas Pipinellis authored Mar 15, 2017
```
Add nested groups documentation

Closes #28761

See merge request !9783
```
  6619772f
- Merge branch 'issue-boards-new-search-bar-ee' into 'master' · 887ef155
  Filipa Lacerda authored Mar 15, 2017
```
Port of issue-boards-new-search-bar to EE

See merge request !1397
```
  887ef155
- Merge branch '28277-document-u2f-limitations-with-multiple-urls' into 'master' · cbedb34a
  Achilleas Pipinellis authored Mar 15, 2017
```
Resolve "Document U2F limitations with multiple URLs"

Closes #28277

See merge request !9300
```
  cbedb34a
- Merge branch 'issue-boards-docs-update' into 'master' · 52d6736c
  Achilleas Pipinellis authored Mar 15, 2017
```
Updated issue boards

See merge request !1419
```
  52d6736c
- Add more info on issue boards milestones · ef5cbc0e
  Achilleas Pipinellis authored Mar 15, 2017
```
[ci skip]
```
  ef5cbc0e
- Added issue boards re-ordering docs · 52d25fba
  Phil Hughes authored Mar 14, 2017
  
  52d25fba
- Merge branch 'issue-boards-docs' into 'master' · 77d54141
  Achilleas Pipinellis authored Mar 15, 2017
```
Added issue boards re-ordering docs

See merge request !9924
```
  77d54141
- Added issue boards re-ordering docs · 8d6969d4
  Phil Hughes authored Mar 14, 2017
  
  8d6969d4
- Merge branch 'fix-milestone-name-on-show' into 'master' · f314bb6c
  Rémy Coutable authored Mar 15, 2017
```
Fix typo on Milestones show page. Fixes #29214

Closes #29214

See merge request !9913
```
  f314bb6c
- Merge branch 'fix-polling-doc' into 'master' · 0d477dc2
  Sean McGivern authored Mar 15, 2017
```
Fix typo in doc/development/polling.md: `If-None-Modified` -> `If-None-Match`

See merge request !9957
```
  0d477dc2
- Merge branch '27551-use-dev-mirror-of-gitlab-git-test-on-dev' into 'master' · 9b2f9af1
  Sean McGivern authored Mar 15, 2017
```
Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different gitlab-git-test repo

Closes #27551

See merge request !9945
```
  9b2f9af1
- Fix rake gitlab:env:info elasticsearch datum and gitlab:app:check task · 5e206bff
  Nick Thomas authored Mar 14, 2017
  
  5e206bff
- Merge branch 'rs-dropdown-author-spec-speed' into 'master' · 79ef2f89
  Rémy Coutable authored Mar 15, 2017
```
Speed up the issues/filtered_search/dropdown_author feature spec

See merge request !9951
```
  79ef2f89
- Fixed eslint · 1e30dafb
  Phil Hughes authored Mar 15, 2017
  
  1e30dafb
- Port of 27376-cache-default-branch-pipeline-on-project to EE · 40f51ecb
  Bob Van Landuyt authored Mar 13, 2017
  
  40f51ecb
- Removed the need for extra variable creation · 0c877607
  Phil Hughes authored Mar 15, 2017
  
  0c877607
- Merge branch 'test-db-rollback' into 'master' · 9226ce9e
  Kamil Trzciński authored Mar 15, 2017
```
Add a test which would rollback db and migrate again

Closes #29106

See merge request !9908
```
  9226ce9e
- Change naming from nested groups to subgroups · db8f6259
  Achilleas Pipinellis authored Mar 15, 2017
```
[ci skip]
```
  db8f6259
- Merge branch '29469-message-for-project-x-will-be-deleted-should-include-namespace' into 'master' · 5694d9e5
  Rémy Coutable authored Mar 15, 2017
```
Display full project name with namespace upon deletion

Closes #29469

See merge request !9955
```
  5694d9e5
- Fix typo in doc/development/polling.md: `If-None-Modified` -> `If-None-Match` · 028bca7b
  Rémy Coutable authored Mar 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  028bca7b
- Merge branch 'fix-migration-rc1-rollback' into 'master' · 253b61d2
  Stan Hu authored Mar 15, 2017
```
Fixing two migrations that could not be rolled back

See merge request !9953
```
  253b61d2
- Merge branch 'fix-migration-rc1-rollback' into 'master' · 50aa3923
  Stan Hu authored Mar 15, 2017
```
Fix rollback for an EE migration

See merge request !1425
```
  50aa3923
- Display full project name with namespace upon deletion · 3a6c7a2d
  Mark Fletcher authored Mar 15, 2017
```
* Removes ambiguity when two projects exist with the same name
```
  3a6c7a2d
- Fix rollback for an EE migration · 47746b5c
  DJ Mountney authored Mar 14, 2017
```
Move the index removal to be before the column removal
```
  47746b5c
- Fixing two migrations that could not be rolled back · fbbaff4a
  DJ Mountney authored Mar 14, 2017
```
when rolling back from 9-0-stable to 8.17.3
```
  fbbaff4a
- Merge branch '29414-fix-toggle-disccusion-link-jump-pick-into-9-0' into 'master' · 8fddde5b
  Alfredo Sumaran authored Mar 15, 2017
```
Fix link togglers jumping to top

Closes #29414

See merge request !9943
```
  8fddde5b
- Merge branch '28187-project-name-cut-off-with-nested-groups' into 'master' · 2a3127d0
  Alfredo Sumaran authored Mar 15, 2017
```
Toggle long Project names

Closes #28187

See merge request !9501
```
  2a3127d0
14 Mar, 2017 1 commit
- Speed up the issues/filtered_search/dropdown_author feature spec · 02fd4a80
  Robert Speicher authored Mar 14, 2017
  
  02fd4a80