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

238 Commits

Author SHA1 Message Date
Clement Ho 8bd38fdc25 Merge branch 'master' into bootstrap4 2018-04-23 08:51:42 -05:00
Clement Ho ee5b470831 Fix bug where resolved discussions were not visible when toggled 2018-04-20 10:33:55 -05:00
Simon Knox 3dc8ad277d Resolve "Text from the diff is showing within a table header inside the discussion after the discussion is resolved" 2018-04-20 07:47:08 +00:00
Clement Ho 694b290a2e [skip ci] Merge branch 'master' into bootstrap4 2018-04-17 12:24:25 -05:00
Phil Hughes 606ed05edf Merge branch '45271-collpased-diff-loading' into 'master' 
Resolve "Collapsed diff spacing wrong when failed to load"

Closes #45271 and #45317

See merge request gitlab-org/gitlab-ce!18351
 2018-04-17 15:22:44 +00:00
Filipa Lacerda 4b2ff00392
Disable try again button while fetching the API 2018-04-16 16:36:24 +01:00
Filipa Lacerda 8f189df86f
Use different class for try again button in collapsed diffs 2018-04-16 12:30:46 +01:00
Filipa Lacerda 5b171cee3a
Remove unused imports 2018-04-13 09:55:47 +01:00
Filipa Lacerda a236b5e6a2 Render only one error message per diff 
Move html to haml file instead of JS
 2018-04-13 09:50:35 +01:00
Clement Ho 705d7f703b [skip ci] Use toggleClass instead of toggle 2018-04-12 14:13:50 -05:00
Clement Ho b8401cd0b2 Merge branch 'master' into bootstrap4 2018-04-12 13:47:30 -05:00
Filipa Lacerda b01fd7ad81
Fixes unresolved discussions rendering the error state instead of the diff 2018-04-12 17:29:54 +01:00
Clement Ho 09ab85a936 Revert "Merge branch '44870-remove-extra-space-around-comment-form-on-merge-requests' into 'master'" 
This reverts merge request !18120
 2018-04-12 15:10:40 +00:00
Clement Ho 9bcf8f43c6 [skip ci] Replace hidden-xs 2018-04-09 16:50:40 -05:00
Takuya Noguchi 058909e7c5 Refactor and tweak margin for note forms on Issuable 
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
 2018-04-04 22:27:15 +09:00
Winnie Hellmann 64572b5349 Cleanup test for disabling comment submit button 2018-03-22 14:48:03 +01:00
Jacob Schatz 32ce1e3a00 Disables the button when submitting comment. 2018-03-21 14:28:39 -04:00
Simon Knox 6cfbb4459e Resolve "Notes karma specs failing" 2018-03-19 14:37:48 +00:00
Fatih Acet fdc9ae2edf
Prettify notes. 2018-03-16 23:16:21 +03:00
Simon Knox 8fa001e760 Resolve "Projects::MergeRequestsController#show is slow (implement skeleton loading)" 2018-03-13 12:01:36 +00:00
Fatih Acet 059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00
Jacob Schatz 35c8fd5586 Update to jQuery 3. 2018-02-20 22:20:48 +00:00
Clement Ho 0cc87e5f6d Remove duplicate axios import 2018-02-02 12:28:13 -06:00
Filipa Lacerda 8fa2932dc5 Merge branch 'ph-axios-2' into 'master' 
More conversions to axios

See merge request gitlab-org/gitlab-ce!16800
 2018-02-02 18:12:12 +00:00
Phil Hughes 1c8553f21e
Converted notes.js to axios 2018-02-01 10:50:18 +00:00
Phil Hughes 4377b4795f
remove useless ajaxPost method 2018-02-01 09:14:53 +00:00
Phil Hughes 641f1d2c4b
Converted common_utils to axios 2018-01-31 10:14:55 +00:00
Phil Hughes eaf2f48dc7
Export and use Notes ES module 2017-12-15 16:33:36 +00:00
Filipa Lacerda 3c19c971df
Merge branch 'master' into 38869-datetime 
* master: (112 commits)
  small change to make less conflict with EE version
  Add cop for use of remove_column
  Resolve merge conflicts with dev.gitlab.org/master after security release
  add index for doc/administration/operations/
  Remove RubySampler#sample_objects for performance as well
  Bugfix: User can't change the access level of an access requester
  Add spec for removing issues.assignee_id
  updated imports
  Keep track of storage check timings
  Remove a header level in the new 'Automatic CE->EE merge' doc
  Improve down step of removing issues.assignee_id column
  Fix specs after removing assignee_id field
  Remove issues.assignee_id column
  Resolve conflicts in app/models/user.rb
  Fix image view mode
  Do not raise when downstream pipeline is created
  Remove the need for destroy and add a comment in the spec
  Use build instead of create in importer spec
  Simplify normalizing of paths
  Remove allocation tracking code from InfluxDB sampler for performance
  ...
 2017-12-11 19:42:58 +00:00
Phil Hughes 6bb4442054
updated imports 2017-12-11 12:28:11 +00:00
Phil Hughes e0bbadc2d2
use exported methods instead of gl.utils 2017-12-08 08:54:51 +00:00
Filipa Lacerda 139ce1c445
Export date utility functions as ES6 modules 2017-12-07 11:09:17 +00: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
Tim Zallmann 980f29716f Resolve "Convert autosize.js library to be a Yarn managed library" 2017-10-31 09:18:30 +00: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
Mike Greiling f7bdfe5098 Merge branch 'master' into 'es-module-autosave' 
# Conflicts:
#   app/assets/javascripts/issuable_form.js
#   app/assets/javascripts/notes.js
 2017-10-24 07:52:21 +00:00
Luke "Jared" Bennett 1ae013dad5
Fix karma 2017-10-23 14:37:32 +01:00
Luke "Jared" Bennett 3176eb83b6
Added discussion_line_code value to note response and use it to query the right row for the discussion UI 2017-10-21 16:19:04 +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
Ben Boeckel d0630ed38d notes.js: also return the original content when getting form data 2017-10-19 11:48:30 -04:00
Filipa Lacerda 6ffd34897d Remove dropzoneInput from global namespace 2017-10-19 07:45:52 +00:00
Mike Greiling b0c2772a90
convert Autosave into pure es module and remove global export 2017-10-12 11:31:29 -05:00
Clement Ho c194f22814 Merge branch '38871-cleanup-data-page-attribute-after-karma-test' into 'master' 
Cleanup data-page attribute after each Karma test

Closes #38871

See merge request gitlab-org/gitlab-ce!14742
 2017-10-11 17:37:20 +00:00
Eric Eastwood 03cd536b54 Cleanup data-page attribute after each Karma test 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38871
 2017-10-11 11:02:55 -05:00
Phil Hughes 556ef5ed9f
spec fixes 2017-10-11 08:41:33 +01:00
Phil Hughes 44d3745e51
Moves form related JS modules out of global 2017-10-11 08:41:33 +01:00
Phil Hughes fcd842b558
fixed notes specs 
changed how the container class is added onto the text element
more specs
 2017-10-10 10:14:23 +01:00
Phil Hughes d668294f28
spec fixes 2017-10-10 10:14:22 +01:00
Phil Hughes fa2af5e0f5
Flash is now a ES6 module 
Reduced the technical debt around our JS flash function by making it a
module that is imported rather than relying on the global function.
The global function still exists mainly for technical debt with how
some requests are being completed, but new JS should import the module
directly.

Also reduces some tech debt in the file by removing the need for jQuery.
Instead Flash is now 100% vanilla JS.
 2017-10-10 10:14:22 +01:00
Felipe Artur b54203f0ad Commenting on image diffs 2017-10-07 04:25:17 +00:00