root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
63,783 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

1790 Commits

Author SHA1 Message Date
Filipa Lacerda 0d18f35fbd Merge branch 'winh-skip-parsePikadayDate-test' into 'master' 
Temporarily remove parsePikadayDate test

Closes #39834

See merge request gitlab-org/gitlab-ce!15217
 2017-11-06 15:01:11 +00:00
Winnie Hellmann 19737aeaa9 Remove parsePikadayDate test 2017-11-06 14:54:33 +01:00
Winnie Hellmann 51f73b86ad Use Vue warnhandler 2017-11-06 13:36:07 +01:00
Filipa Lacerda 46dc343f60 Merge branch '38677-render-new-discussions-on-diff-tab' into 'master' 
Added discussion_line_code value to note response and use it to query the right…

Closes #38677

See merge request gitlab-org/gitlab-ce!14981
 2017-11-06 09:55:02 +00:00
Filipa Lacerda 3852d404f3 Merge branch 'icons-ci-icons' into 'master' 
Convert Icons in CI to SVG Sprite Icons

See merge request gitlab-org/gitlab-ce!14567
 2017-11-02 15:54:46 +00:00
Luke "Jared" Bennett 3ce6960b35 Remove useless closeReopenReport specs 2017-11-02 14:49:00 +00:00
Tim Zallmann 8e8ab2f3eb Merge branch 'winh-admin-projects-namespace-filter' into 'master' 
Make NamespaceSelect change URL when filtering

Closes #37277

See merge request gitlab-org/gitlab-ce!14888
 2017-11-02 12:59:05 +00:00
Filipa Lacerda 0fd3fda8c6 Merge branch 'multi-file-editor-binary-editor' into 'master' 
Fix binary files not showing anything in edit mode

See merge request gitlab-org/gitlab-ce!15124
 2017-11-02 10:06:06 +00:00
Tim Zallmann 78dc777816 Merge branch 'vue-update' into 'master' 
Updated Vue to 2.5.1

See merge request gitlab-org/gitlab-ce!14874
 2017-11-02 09:29:19 +00:00
Phil Hughes 984f3b7dff
Fix binary files not showing anything in edit mode 2017-11-01 13:03:19 +00:00
Filipa Lacerda 1fc4e2b6c6 Export logo and labels select as ES6 modules 2017-11-01 12:32:15 +00:00
Phil Hughes b20381204a
karma spec updates 2017-11-01 09:26:16 +00:00
Tim Zallmann e148f1f9f2 Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library" 2017-11-01 08:58:41 +00:00
Filipa Lacerda b86c3a7365 Merge branch 'multi-file-editor-vuex' into 'master' 
Move multi-file editor store to Vuex

See merge request gitlab-org/gitlab-ce!15046
 2017-10-31 16:30:56 +00:00
Eric Eastwood 6dc9028fbb Load participants async 2017-10-31 16:15:03 +00:00
Phil Hughes c598283a16 Merge branch '38869-issue' into 'master' 
Remove issue and issue status select from global namespace

See merge request gitlab-org/gitlab-ce!15090
 2017-10-31 13:14:38 +00:00
Phil Hughes f2f24f05f8
fixed up upload feature after master merge 2017-10-31 12:13:29 +00:00
Phil Hughes e6a1a798f5
Merge branch 'master' into multi-file-editor-vuex 2017-10-31 11:24:42 +00:00
Phil Hughes 68d1e9d1c4 Upload files through the multi-file editor 2017-10-31 10:47:10 +00:00
Tim Zallmann 980f29716f Resolve "Convert autosize.js library to be a Yarn managed library" 2017-10-31 09:18:30 +00:00
Phil Hughes ac8e94d4d5
Merge branch 'master' into multi-file-editor-vuex 2017-10-31 09:10:03 +00:00
Phil Hughes 662f87ca37
spec fixes 2017-10-31 09:06:23 +00:00
Filipa Lacerda 1c978aff62
Fix broken test 2017-10-30 19:50:17 +00:00
Phil Hughes 098a98055a
spec fixes 
increased perf of scrolling tabs into view
 2017-10-30 16:25:32 +00:00
Phil Hughes 5c75d750cf
addressed feedback from review 
spec fixes
 2017-10-30 14:36:24 +00:00
Phil Hughes 4b80cde2c8
Merge branch 'master' into multi-file-editor-vuex 2017-10-30 11:26:25 +00:00
Filipa Lacerda 46d8209e8c Merge branch 'master' into 38869-importer_status 
* master: (51 commits)
  Move locked check to a guard-clause
  Ci::Build tag is a trait instead of an own factory
  [CE backport] Saved configuration for issue board
  Use the correct project visibility in system hooks
  Add changelog
  more readable changelog
  Make merge_jid handling less stateful in MergeService
  Fetch the merged branches at once
  remove extra whitespace
  use a delegate for `username` to be more future friendly
  Merging EE doc into CE
  add changelog entry
  Avoid using Rugged in Gitlab::Git::Wiki#preview_slug
  Cache commits on the repository model
  Remove groups_select from global namespace & simplifies the code
  Change default disabled merge request widget message to "Merge is not allowed yet"
  Semi-linear history merge is now available in CE.
  Remove repetitive karma spec
  Improve spec to check hidden component
  Rename to shouldShowUsername
  ...
 2017-10-30 11:19:07 +00:00
Tim Zallmann 667cd6257e Improved Var Caching, Line Setup, Specs 2017-10-30 10:30:15 +01:00
Tim Zallmann 8e828bef98 fdescribe remove :-/ 2017-10-30 10:30:15 +01:00
Tim Zallmann 6ff5e0c3a0 Updated icon.vue to be more inline with other components + added spec for it 2017-10-30 10:30:15 +01:00
Tim Zallmann ce75de08f0 Fixes for Tests 2017-10-30 10:27:46 +01:00
Tim Zallmann 4731eba4c3 Update Action Icons 2017-10-30 10:27:46 +01:00
Tim Zallmann d01d509bd8 Fixing Icons 2017-10-30 10:27:46 +01:00
Luke "Jared" Bennett 2f130527c0
FE review changes - remove internal details assertion and look for closest form if no discussion_line_code 2017-10-27 20:43:04 +01:00
Phil Hughes 47c906eb57
updated karma specs 2017-10-27 18:16:28 +01:00
Fatih Acet ab9b54f977 Merge branch 'add-user-avatar-username-link' into 'master' 
Add configurable option to display username in user avatar link component

See merge request gitlab-org/gitlab-ce!14902
 2017-10-27 12:50:58 +00:00
Eric Eastwood b7835587e5 Change default disabled merge request widget message to "Merge is not allowed yet" 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39188
 2017-10-27 04:52:30 -04:00
Clement Ho 4e8010aa9d Remove repetitive karma spec 2017-10-27 16:21:56 +08:00
Clement Ho b1b596be89 Improve spec to check hidden component 2017-10-27 16:20:53 +08:00
Filipa Lacerda 94743e0e8f
Remove issuable form from global namespace 2017-10-26 23:21:55 +03:00
Filipa Lacerda a665a35438
Remove issuableContext from global namespace 2017-10-26 23:14:46 +03:00
Filipa Lacerda cf542f9ed0
Improves issuable tests 
Fixes missing dependencies
 2017-10-26 23:06:06 +03:00
Winnie Hellmann 34d53d2b5a Add failing test for https://gitlab.com/gitlab-org/gitlab-ce/issues/37277 2017-10-26 14:53:17 +02:00
Phil Hughes 3ddffec0d6 Merge branch '38178-fl-mr-notes-components' into 'master' 
Moves placeholders components into shared folder with documentation.

See merge request gitlab-org/gitlab-ce!14964
 2017-10-25 15:45:40 +00:00
Luke "Jared" Bennett b5079721bf
Add spec for root diff discussion note 2017-10-24 22:48:55 +01:00
Filipa Lacerda cc17067085 Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master' 
Add new files & directories in the multi-file editor

Closes #38614

See merge request gitlab-org/gitlab-ce!14839
 2017-10-24 09:06:55 +00:00
Phil Hughes 743050cede Merge branch '37860-pipelines-page' into 'master' 
Make pipelines table in MR view usable

See merge request gitlab-org/gitlab-ce!14941
 2017-10-23 16:19:34 +00:00
Filipa Lacerda c2d943a7ea
Changes after review 2017-10-23 16:38:57 +03:00
Luke "Jared" Bennett 1ae013dad5
Fix karma 2017-10-23 14:37:32 +01:00
Phil Hughes c147bccc45
Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdown 2017-10-23 14:01:22 +01:00