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,245 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

1757 Commits

Author SHA1 Message Date
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 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
Filipa Lacerda 1c978aff62
Fix broken test 2017-10-30 19:50:17 +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
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
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
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
Phil Hughes c147bccc45
Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdown 2017-10-23 14:01:22 +01:00
Phil Hughes 133e66d22d
spec fixes 2017-10-23 13:12:05 +01:00
Filipa Lacerda 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
Jacob Schatz 07a8c54355 Create new branch from dropdown. 2017-10-23 10:57:23 +00:00
Phil Hughes 4699cf77b6
added feature spec 2017-10-23 10:47:22 +01:00
Phil Hughes 4c186f99f2
fixed failing title test 2017-10-23 10:46:53 +01:00
Phil Hughes 60ce5155c8
fixed bug with tabs not switching correctly 
clears all tmp files after cancelling edit mode
 2017-10-23 10:46:27 +01:00
Phil Hughes 10dcaea1c3
failing spec fixes 2017-10-23 10:45:44 +01:00
Phil Hughes 389c852d12
correctly creates file in currently viewed directory 
specs
 2017-10-23 10:45:44 +01:00
Filipa Lacerda 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
Filipa Lacerda 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
Phil Hughes 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
Eric Eastwood 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
Phil Hughes 741233321d
Added submodule support in multi-file editor 2017-10-20 11:31:57 +01:00
Ben Boeckel 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
Filipa Lacerda cf347a5739
Remove Diff class from globalnamespace 2017-10-19 10:57:25 +01:00
Filipa Lacerda 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
Filipa Lacerda 6ffd34897d Remove dropzoneInput from global namespace 2017-10-19 07:45:52 +00:00
Filipa Lacerda bf4a3ac23e
Make pipelines table in MR view usable 2017-10-18 17:37:16 +01:00
Tim Zallmann 852f6f79f2 Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master' 
Add lazy option to UserAvatarImage

See merge request gitlab-org/gitlab-ce!14895
 2017-10-18 12:36:45 +00:00
Filipa Lacerda 941c11824a Fix Pikaday 2017-10-18 11:31:01 +00:00
Robert Speicher 11dfe0489b Merge branch 'sh-security-fix-backports-master' into 'master' 
Backport all fixes from GitLab 10.1 into master

See merge request gitlab-org/gitlab-ce!14922
 2017-10-18 11:08:04 +00:00
Clement Ho 2b4083d3ac Add configurable option to display username in user avatar link component 2017-10-18 12:43:02 +02:00
Grzegorz Bizon 0fa2f14857 Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master' 
Add short_revision and use total_size

Closes #39203

See merge request gitlab-org/gitlab-ce!14917
 2017-10-18 09:02:32 +00:00
Stan Hu 891a9ce8b0 Merge branch 'master' into sh-security-fix-backports-master 2017-10-17 16:02:32 -07:00
Jen-Shin Lin bd46c8abfd Merge branch 'security-10-1' into '10-1-stable' 
Security fixes for 10.1 RC

See merge request gitlab/gitlabhq!2209
 2017-10-17 15:58:58 -07:00
Filipa Lacerda 6ac0a69b68
Fix broken test 2017-10-17 21:13:22 +01:00
Eric Eastwood bc3195da0a Add lazy option to UserAvatarImage 2017-10-17 14:47:47 -05:00
Filipa Lacerda b3f749036e Merge branch 'ph-multi-file-editor-restructure-data' into 'master' 
Refactored multi-file data structure

See merge request gitlab-org/gitlab-ce!14862
 2017-10-17 17:40:13 +00:00
Clement Ho baf07e914d Add inline edit button to issue_show app 2017-10-17 17:04:33 +00:00
Phil Hughes c23c09366d Merge branch 'move-user-avatar-specs' into 'master' 
Move user avatar specs to folder to mimic javascript directory

Closes #39169

See merge request gitlab-org/gitlab-ce!14901
 2017-10-17 16:21:22 +00:00
Clement Ho 22a120a24d Improve sprite icon spec 2017-10-17 16:19:40 +00:00
Kamil Trzcinski 5ee58c1c06 Add short_revision and use total_size 2017-10-17 16:58:28 +02:00
Phil Hughes bdbcf58ac0
fixed Karam test because of event name change 2017-10-17 11:46:00 +01:00