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

257 Commits

Author SHA1 Message Date
Clement Ho 46031d63cd [skip ci] Convert panel related class names to card 2018-04-10 12:11:34 -05:00
Clement Ho 35991d1662 [skip ci] Replace hidden-sm 2018-04-09 16:36:25 -05:00
Clement Ho 3e7a17d475 Replace .pull-left with .float-left 2018-04-09 12:36:21 -05:00
Clement Ho aa4942a213 Merge branch 'master' into 'bootstrap4' 
# Conflicts:
#   app/helpers/issuables_helper.rb
#   app/views/projects/_home_panel.html.haml
#   app/views/projects/commits/_commit.html.haml
 2018-04-09 17:04:05 +00:00
Clement Ho 3ae87eef06 Replace .btn-group-justified with .btn-group.d-flex 2018-04-09 11:57:53 -05:00
Clement Ho 917b7e0dd9 Rename .btn-default to .btn-secondary 2018-04-09 11:49:18 -05:00
Fatih Acet 52b232ca5d Merge branch '44939-epic-comment-thread-backports' into 'master' 
Resolve "Follow-up from "Refactor discussions/notes code""

Closes #44939

See merge request gitlab-org/gitlab-ce!18190
 2018-04-06 10:09:01 +00:00
Kushal Pandya 223eeae1a7 Return noteableType from app initial config 2018-04-06 14:26:39 +05:30
Kushal Pandya 15195f6784 Use noteable type map from constants 2018-04-06 14:26:39 +05:30
Kushal Pandya 388f43b611 Add map for supported noteable types 2018-04-06 14:26:30 +05:30
Clement Ho 93869c63bc Merge branch '44870-remove-extra-space-around-comment-form-on-merge-requests' into 'master' 
Resolve HTML/CSS inconsistent comment forms on Issue and Merge Request

Closes #44870

See merge request gitlab-org/gitlab-ce!18120
 2018-04-05 15:24:02 +00: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
Jan Provaznik 65664c2eae Refactor discussions/notes code 2018-04-03 16:03:00 +00:00
Simon Knox 39ee707c0a Don't show Jump to Discussion button on issue notes 2018-03-28 16:11:06 +11:00
Fatih Acet fdc9ae2edf
Prettify notes. 2018-03-16 23:16:21 +03:00
Filipa Lacerda 93c6842fbf
Use mapState instead of a getter 2018-03-13 10:39:07 +00:00
Filipa Lacerda 939c87233e Merge branch 'master' into 44149-issue-comment-buttons 
* master: (29 commits)
  Fix provider server URL used when listing repos to import
  Fix inconsistent punctuation on MR form
  Update dependency for svgs
  Fix timestamp to include %M instead of %I for post-deploy migrations.
  Use Gitaly 0.89.0
  Resolve "Hover style for sidebar dropdowns is wrong"
  fixed spec
  Respect the protocol in `expose_url`
  Fix removes source branch text being rendered in merged state
  Fix code and wiki search results when filename is non-ASCII
  Include the ee/ directory in backtraces
  Use GitLab fork of zaproxy
  Updates file extensions on Vue docs
  fixed note polling not sending updated last fetched at date added spec for polling
  Add changelog entry
  Use `list.id` for `:key`
  added mutation spec
  Bump parser and unparser gems to remove warnings
  fix polling not working correctly
  Fixed issue notes being duplicated
  ...
 2018-03-13 09:19:41 +00:00
Filipa Lacerda e84c943fa0
Fix loading icon being visible in the wrong button 2018-03-12 17:08:05 +00:00
Filipa Lacerda b3daf108aa Merge branch 'fix-duplicate-notes' into 'master' 
Fixed issue notes being duplicated

Closes #44099

See merge request gitlab-org/gitlab-ce!17671
 2018-03-12 15:48:04 +00:00
Phil Hughes 63d3581e66
fixed note polling not sending updated last fetched at date 
added spec for polling
 2018-03-12 09:57:22 +00:00
Phil Hughes 98e31bf437
added mutation spec 2018-03-10 18:17:01 +00:00
Mike Greiling f248be7257
require jQuery to be explicitly imported 2018-03-09 15:18:09 -06:00
Phil Hughes 87be05bff0
fix polling not working correctly 2018-03-09 18:28:23 +00:00
Phil Hughes 52b70f0428
Fixed issue notes being duplicated 
Closes #44099
 2018-03-09 18:22:23 +00:00
Filipa Lacerda 51b8874148 Removes btn-transparent and btn-clipboard as default classes for clipboard button component 
Changes after review
 2018-03-06 21:05:46 +00:00
Fatih Acet 059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00
Filipa Lacerda c33245e999
Reuse getter 
Add loading button for better UX
 2018-02-12 16:49:41 +00:00
Filipa Lacerda 853c80a9f7
Put back class names used in shared test 2018-02-12 08:54:31 +00:00
Filipa Lacerda d637f87f88
Makes close/reopen issue request to inside the vue app 2018-02-09 18:56:41 +00:00
Simon Knox 2ee08f4770 Resolve "Cancelling a second comment edit doesn't return its state to before the edit" 2018-02-07 21:45:53 +00:00
Annabel Dunstone Gray 857cd6338c
Remove trailing space after author name in note header 2018-01-18 11:45:27 -07:00
Eric Eastwood 333c1723ab Fix Ctrl+Enter keyboard shortcut saving comment/note edit 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41956
 2018-01-11 20:28:56 -06:00
Filipa Lacerda 7e3405d76c
Fix last eslint rules 2018-01-08 20:48:27 +00:00
Filipa Lacerda 349d06688f
Fix more eslint rules 2018-01-08 20:01:49 +00:00
Filipa Lacerda 7c7f526684
[ci skip] Fix more rules 2018-01-05 14:31:12 +00:00
Filipa Lacerda cdc4938834
[ci skip] Fix more rules 2018-01-05 00:45:32 +00:00
Filipa Lacerda b299198e1e
Adds `eslint-plugin-vue`, fixes linter errors and adds docs 2018-01-03 23:14:55 +00:00
Filipa Lacerda ba5b539548 Merge branch '37619-fix-vue-typeerror-not-failing-the-build' into 'master' 
Stop "ERROR: TypeError{}" from being logged to the console and fail tests

Closes #37619

See merge request gitlab-org/gitlab-ce!15830
 2017-12-12 10:49:50 +00:00
Fatih Acet 8d739237de Merge branch 'issue-note-rename' into 'master' 
rename remaining issue_ prefixed files

See merge request gitlab-org/gitlab-ce!15818
 2017-12-11 21:56:50 +00:00
Filipa Lacerda 4ccbd556d9 Merge branch 'url-utility-es-module' into 'master' 
Moved URL utility methods into exported es modules

See merge request gitlab-org/gitlab-ce!15783
 2017-12-11 18:44:17 +00:00
Eric Eastwood 9469979a91 Try to clean up legit Vue error that was patched over 
See https://gitlab.com/gitlab-org/gitlab-ce/issues/37619#note_50422859
 2017-12-10 05:10:38 -06:00
Fatih Acet f4fbe61a9e Merge branch 'note-preview' into 'security-10-2' 
prevent potential XSS when editing comment

See merge request gitlab/gitlabhq!2238

(cherry picked from commit 80ed6d25a46c0f70ec8baea78b5777118d63876c)

7480e462 prevent potential XSS when editing comment
 2017-12-08 13:48:23 -08:00
Simon Knox 874deb4142 rename remaining issue_ prefixed files 2017-12-09 07:24:52 +11:00
Phil Hughes e0bbadc2d2
use exported methods instead of gl.utils 2017-12-08 08:54:51 +00:00
Eric Eastwood e6ac6734c2 Use relative _path helper URLs in the GitLab UI 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825
 2017-12-07 11:19:37 -06:00
Mike Greiling 2c569be63b Resolve "Display member role per project" 2017-12-07 09:11:41 +00:00
Simon Knox bf85a90037 issue note component rename 2017-12-04 16:19:07 +00:00
Simon Knox f8efaf1bf8 issue note store 2017-11-30 22:44:41 +00:00
Luke "Jared" Bennett d0f7e4df34 Resolve "lock/confidential issuable sidebar custom svg icons iteration" 2017-11-16 16:44:16 +00:00
Luke "Jared" Bennett 8ba8800660
Disable issue action button whilst submitting and test 2017-11-06 11:42:11 +00:00