提交 · 3eb8569778ce2559eedab706f6f901238e39b355 · 李少辉-开发者 / gitlab-foss

11 1月, 2017 7 次提交
- L
  Correct merge conflicts · 3eb85697
  由 Luke "Jared" Bennett 提交于 12月 10, 2016
```
Fixed eslint failures
```
  3eb85697
- M
  
  use karma for javascript testing · a569aa29
  由 Mike Greiling 提交于 11月 21, 2016
  
  a569aa29
- M
  
  fix rubocop complaint about ambiguous splat operator · 11e9f32d
  由 Mike Greiling 提交于 11月 21, 2016
  
  11e9f32d
- M
  
  exempt node_modules from rubocop linting · a2c1f2e0
  由 Mike Greiling 提交于 11月 21, 2016
  
  a2c1f2e0
- M
  
  precompile webpack assets when testing · 720650d2
  由 Mike Greiling 提交于 11月 03, 2016
  
  720650d2
- M
  
  disable "use strict" in babel config as it was broken in sprockets · 24b48a37
  由 Mike Greiling 提交于 11月 04, 2016
  
  24b48a37
- M
  
  migrate all javascript asset bundles and require syntax · fe964cc2
  由 Mike Greiling 提交于 11月 03, 2016
  
  fe964cc2
07 1月, 2017 7 次提交
- M
  
  replace application.js sprockets output with webpack-generated equivalent · 55f291e8
  由 Mike Greiling 提交于 10月 28, 2016
  
  55f291e8
- M
  
  temporarily regress to babel 5 for parity with sprockets-es6 gem · 31bd3684
  由 Mike Greiling 提交于 10月 20, 2016
  
  31bd3684
- M
  
  conditionally apply webpack-dev-server config · 000180e5
  由 Mike Greiling 提交于 10月 19, 2016
  
  000180e5
- M
  
  optimize production output and generate sourcemaps · 61ca496b
  由 Mike Greiling 提交于 10月 19, 2016
  
  61ca496b
- M
  
  compile es6/es2015 with babel · df72d65a
  由 Mike Greiling 提交于 10月 19, 2016
  
  df72d65a
- M
  add webpack, webpack-rails, and webpack-dev-server along with a simple hello world test · 4c5ff1d0
  由 Mike Greiling 提交于 10月 18, 2016
```
Add the following line to GDK Procfile to play with it:

    webpack: exec support/exec-cd gitlab npm run dev-server
```
  4c5ff1d0
- A
  Merge branch '26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task' into 'master' · 57652bf5
  由 Alfredo Sumaran 提交于 1月 06, 2017
```
Precompile all frontend test fixtures

Closes #26226

See merge request !8384
```
  57652bf5
06 1月, 2017 26 次提交
- S
  Merge branch 'speed-up-group-milestone-index' into 'master' · 729636bd
  由 Sean McGivern 提交于 1月 06, 2017
```
Speed up group milestone index by passing group_id to IssuesFinder

See merge request !8363
```
  729636bd
- A
  
  Speed up group milestone index by passing group_id to IssuesFinder · f13c650c
  由 Adam Niedzielski 提交于 1月 06, 2017
  
  f13c650c
- R
  Merge branch 'dz-whitelist-some-project-names' into 'master' · e553c3b4
  由 Rémy Coutable 提交于 1月 06, 2017
```
Whitelist next project names: assets, profile, public

See merge request !8470
```
  e553c3b4
- R
  Merge branch 'fix-users-api-500-error' into 'master' · 4c343310
  由 Rémy Coutable 提交于 1月 06, 2017
```
Fix 500 errors when creating a user with identity via API

Closes #26295

See merge request !8442
```
  4c343310
- R
  Merge branch 'set_ldap_config_attributes_defaults' into 'master' · 11f3da9d
  由 Rémy Coutable 提交于 1月 06, 2017
```
LDAP attributes needs default values

See merge request !8465
```
  11f3da9d
- D
  Whitelist next project names: assets, profile, public · 3551a625
  由 Dmitriy Zaporozhets 提交于 1月 06, 2017
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3551a625
- D
  
  LDAP attributes needs default values · de4eee08
  由 Drew Blessing 提交于 1月 05, 2017
  
  de4eee08
- A
  Merge branch 'fix-timezone-due-date-picker' into 'master' · 6003f6ea
  由 Alfredo Sumaran 提交于 1月 06, 2017
```
Fix timezone due date picker

Closes #24253

See merge request !8081
```
  6003f6ea
- A
  Merge branch 'fix-u2f-fixtures' into 'master' · 81dfb1aa
  由 Alfredo Sumaran 提交于 1月 05, 2017
```
Replace static JavaScript fixtures for u2f

See merge request !8426
```
  81dfb1aa
- A
  
  Wait for ajax after clicking on a date · 55fe57eb
  由 Alfredo Sumaran 提交于 1月 05, 2017
  
  55fe57eb
- A
  Merge branch '26352-user-dropdown-settings' into 'master' · 76bb8ed4
  由 Annabel Dunstone Gray 提交于 1月 05, 2017
```
26352 Change Profile settings to User / Settings

Closes #26352

See merge request !8453
```
  76bb8ed4
- F
  Merge branch 'markdown-button-newline-bug-fix' into 'master' · 297e6e29
  由 Fatih Acet 提交于 1月 05, 2017
```
Fixed new line being included in bold/italic in GFM form

Closes #25456

See merge request !8086
```
  297e6e29
- F
  Merge branch '26155-merge-request-tabs-don-t-render-when-no-commits-available' into 'master' · 32b1ceb0
  由 Fatih Acet 提交于 1月 05, 2017
```
Resolve "Merge request tabs don't render when no commits available"

Closes #26155 and #24556

See merge request !8347
```
  32b1ceb0
- M
  
  fix right_sidebar_spec ajax call · f19330e4
  由 Mike Greiling 提交于 1月 03, 2017
  
  f19330e4
- M
  
  replace Teaspoon fixture methods with jasmine-jquery methods to reduce dependency on Teaspoon · 7a2a9bb4
  由 Mike Greiling 提交于 12月 30, 2016
  
  7a2a9bb4
- M
  Merge branch 'fix-u2f-fixtures' into 26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task · 10d483ea
  由 Mike Greiling 提交于 1月 05, 2017
```
* fix-u2f-fixtures:
  generate u2f frontend fixtures dynamically
  force utf-8 encoding for prior to fixture parsing to prevent nokogiri issues
  exclude script type=text/template from dom scrubbing
```
  10d483ea
- M
  
  generate u2f frontend fixtures dynamically · df5223de
  由 Mike Greiling 提交于 1月 03, 2017
  
  df5223de
- M
  
  force utf-8 encoding for prior to fixture parsing to prevent nokogiri issues · 8cee3b1d
  由 Mike Greiling 提交于 1月 03, 2017
  
  8cee3b1d
- M
  
  exclude script type=text/template from dom scrubbing · ca404170
  由 Mike Greiling 提交于 1月 03, 2017
  
  ca404170
- F
  Merge branch '26346-cannot-reset-or-remove-mr-issues-description-templates' into 'master' · 4a1a06f4
  由 Fatih Acet 提交于 1月 05, 2017
```
Resolve "Cannot reset or remove MR/Issues description templates"

Closes #26346

See merge request !8446
```
  4a1a06f4
- A
  Merge branch 'pipelines-graph-html-css' into 'master' · cd85baf5
  由 Annabel Dunstone Gray 提交于 1月 05, 2017
```
Pipelines graph HTML and CSS improvements  and bug fixing

Closes #26257

See merge request !8443
```
  cd85baf5
- R
  Merge branch... · 3b8c81fe
  由 Rémy Coutable 提交于 1月 05, 2017
```
Merge branch '19966-api-call-to-move-project-to-different-group-fails-when-using-group-and-project-names-instead-of-id' into 'master'

Fix groups API to accept path when transferring a project

Closes #19966

See merge request !8408
```
  3b8c81fe
- R
  Merge branch 'move-admin-deploy-keys-spinach-to-rspec' into 'master' · e0254708
  由 Rémy Coutable 提交于 1月 05, 2017
```
Move admin deploy keys spinach to rspec

See merge request !8405
```
  e0254708
- R
  Merge branch... · 036cafa9
  由 Rémy Coutable 提交于 1月 05, 2017
```
Merge branch '26261-post-api-v3-projects-idorproject-commits-commits-does-not-work-with-project-path' into 'master'

Fix Commits API to accept a Project path upon POST

Closes #26261

See merge request !8406
```
  036cafa9
- F
  
  Adds back removed class in merge request pipelines table · d1fc4ec0
  由 Filipa Lacerda 提交于 1月 05, 2017
  
  d1fc4ec0
- A
  Merge branch 'single-edit-comment-widget-2' into 'master' · e394ad13
  由 Alfredo Sumaran 提交于 1月 05, 2017
```
Refactor discussion edit widget to have only one at a time.

Closes #23227

See merge request !8356
```
  e394ad13