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
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
984f3b7dff
Fix binary files not showing anything in edit mode
2017-11-01 13:03:19 +00:00
1fc4e2b6c6
Export logo and labels select as ES6 modules
2017-11-01 12:32:15 +00:00
b20381204a
karma spec updates
2017-11-01 09:26:16 +00:00
e148f1f9f2
Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library"
2017-11-01 08:58:41 +00:00
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
6dc9028fbb
Load participants async
2017-10-31 16:15:03 +00:00
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
f2f24f05f8
fixed up upload feature after master merge
2017-10-31 12:13:29 +00:00
e6a1a798f5
Merge branch 'master' into multi-file-editor-vuex
2017-10-31 11:24:42 +00:00
68d1e9d1c4
Upload files through the multi-file editor
2017-10-31 10:47:10 +00:00
980f29716f
Resolve "Convert autosize.js library to be a Yarn managed library"
2017-10-31 09:18:30 +00:00
ac8e94d4d5
Merge branch 'master' into multi-file-editor-vuex
2017-10-31 09:10:03 +00:00
662f87ca37
spec fixes
2017-10-31 09:06:23 +00:00
1c978aff62
Fix broken test
2017-10-30 19:50:17 +00:00
098a98055a
spec fixes
...
increased perf of scrolling tabs into view
2017-10-30 16:25:32 +00:00
5c75d750cf
addressed feedback from review
...
spec fixes
2017-10-30 14:36:24 +00:00
4b80cde2c8
Merge branch 'master' into multi-file-editor-vuex
2017-10-30 11:26:25 +00:00
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
47c906eb57
updated karma specs
2017-10-27 18:16:28 +01:00
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
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
4e8010aa9d
Remove repetitive karma spec
2017-10-27 16:21:56 +08:00
b1b596be89
Improve spec to check hidden component
2017-10-27 16:20:53 +08:00
94743e0e8f
Remove issuable form from global namespace
2017-10-26 23:21:55 +03:00
a665a35438
Remove issuableContext from global namespace
2017-10-26 23:14:46 +03:00
cf542f9ed0
Improves issuable tests
...
Fixes missing dependencies
2017-10-26 23:06:06 +03:00
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
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
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
c2d943a7ea
Changes after review
2017-10-23 16:38:57 +03:00
c147bccc45
Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdown
2017-10-23 14:01:22 +01:00
133e66d22d
spec fixes
2017-10-23 13:12:05 +01:00
9931ef4a8a
Merge branch 'fix-escaped-text-replacement' into 'master'
...
Fix escaped text replacement
Closes #37724
See merge request gitlab-org/gitlab-ce!14193
2017-10-23 11:56:28 +00:00
07a8c54355
Create new branch from dropdown.
2017-10-23 10:57:23 +00:00
4699cf77b6
added feature spec
2017-10-23 10:47:22 +01:00
4c186f99f2
fixed failing title test
2017-10-23 10:46:53 +01:00
60ce5155c8
fixed bug with tabs not switching correctly
...
clears all tmp files after cancelling edit mode
2017-10-23 10:46:27 +01:00
10dcaea1c3
failing spec fixes
2017-10-23 10:45:44 +01:00
389c852d12
correctly creates file in currently viewed directory
...
specs
2017-10-23 10:45:44 +01:00
5295f23b4b
Merge branch 'add-shared-vue-loading-button' into 'master'
...
Add loading button
See merge request gitlab-org/gitlab-ce!14883
2017-10-23 09:14:20 +00:00
4ad8c9997d
Merge branch 'master' into 37860-pipelines-page
...
* master: (88 commits)
Fix deletion of container registry or images returning an error
The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix:
Decrease ABC threshold to 54.28
Update VERSION to 10.2.0-pre
Update CHANGELOG.md for 10.1.0
Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`
Fix the external URLs generated for online view of HTML artifacts
Use title as placeholder instead of issue title for reusability
Fix failure in current_settings_spec.rb
Clarify the difference between project_update and project_rename
URI decode Page-Title header to preserve UTF-8 characters
Update Gitaly version to v0.49.0
Decrease Perceived Complexity threshold to 14
Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
Force non diff resolved discussion to display when collapse toggled
Added submodule support in multi-file editor
add note about after_script being run separately
Check for element before evaluate_script
Merge branch 'master-i18n' into 'master'
Update Prometheus gem to fix problems with other files overwriting current file
...
2017-10-23 11:04:28 +03:00
c1ed00e81d
Merge branch '38869-diff' into 'master'
...
Remove Diff class from global namespace
See merge request gitlab-org/gitlab-ce!14965
2017-10-23 07:52:21 +00:00
69be3ce86f
Add loading button
...
Encompasses designs from
- https://gitlab.com/gitlab-org/gitlab-ce/issues/23206#note_43355199
- https://gitlab.com/gitlab-org/gitlab-ce/issues/29985#note_30417407
2017-10-23 05:24:42 +03:00
741233321d
Added submodule support in multi-file editor
2017-10-20 11:31:57 +01:00
1d30e5e964
notes.js: use the original content when resetting the form
...
Otherwise, when an error occurred, the content was escaped and
re-escaped on every error.
Fixes #37724
2017-10-19 13:31:51 -04:00
cf347a5739
Remove Diff class from globalnamespace
2017-10-19 10:57:25 +01:00
1ab8aeeefd
Moves placeholders components into shared folder with documentation. Makes them easier to reuse in MR and Snippets comments
2017-10-19 10:39:47 +01:00
6ffd34897d
Remove dropzoneInput from global namespace
2017-10-19 07:45:52 +00:00
Filipa Lacerda
Tim Zallmann
Phil Hughes
Eric Eastwood
Fatih Acet
Clement Ho
Jacob Schatz
Ben Boeckel