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

72 Commits

Author SHA1 Message Date
Mike Greiling 5f7c0bd7b7 remove Cookies class from global space 2017-03-22 03:07:27 -05:00
Mike Greiling d9dedc36c3 remove Vue from the global space 2017-03-20 22:12:01 -05:00
Phil Hughes adeafa40b8 Fixes diff comment avatar tooltip escaping issues 
We are safe to use `data-html` because we never actually use HTML here, only the pure markdown

Closes #29572
 2017-03-16 15:58:49 +00:00
Bob Van Landuyt 091b846ebe Renamed `.js.es6` to `.js` 2017-03-13 08:27:52 +01:00
Bob Van Landuyt 0267b83898 Delegate a single discussion to a new issue 
Delegate a discussion in a merge request into a new issue.
The discussion wil be marked as resolved and a system note will be
added linking to the newly created issue.
 2017-03-13 08:27:51 +01:00
Phil Hughes 1466b7eecc Added discussion comments avatars to diff 2017-03-08 16:07:26 +00:00
winniehell 572f9782d5 Remove .es6 from file extensions (!9241) 2017-03-05 21:22:40 +01:00
Mike Greiling 8ba08213a1 remove require.context from diff_notes_bundle 2017-02-20 14:29:09 -06:00
Annabel Dunstone Gray 19cb7b0a3d Remove navbar height offsets 2017-02-10 15:09:08 -06:00
Phil Hughes 88fb39c229 Uses shared vue resource interceptor 2017-02-09 15:54:19 +00:00
Phil Hughes f9c58d9388 Refactored diff notes Vue app 
It now relies on its Vue bundle rather than the window. Fixes some reactivity issues that was happening in EE
 2017-02-09 15:54:19 +00:00
Mike Greiling 69e4072f89 Merge branch 'master' into go-go-gadget-webpack 
* master: (389 commits)
  Document "No gems fetched from git repositories" policy [ci skip]
  Typos
  Small gramatical tweaks
  Typos
  Added PHP & NPM doc
  Use `:empty_project` where possible in request specs
  Add caching of droplab ajax requests
  Use `:empty_project` where possible in model specs
  Revert 3f17f29a
  Remove unused js response from refs controller
  Add MR id to changelog entry
  fixed small mini pipeline graph line glitch
  Prevent form to be submitted twice
  Fix Error 500 when repositories contain annotated tags pointing to blobs
  Fix /explore sorting (trending)
  Simplify wording in "adding an image" docs
  Remove "official merge window" from CONTRIBUTING.md [ci skip]
  Update repository check documentation
  Fixed flexbox and wrap issues
  Update two_factor_authentication.md
  ...
 2017-01-27 19:33:58 -06:00
Fatih Acet 4616617dd7 Merge branch 'simple-eslint-fixes' into 'master' 
Simple eslint fixes

See merge request !8536
 2017-01-19 16:01:26 +00:00
Mike Greiling 0d2ae3e7c1 Merge branch 'master' into go-go-gadget-webpack 
* master: (67 commits)
  Add some API endpoints for time tracking.
  use destructuring syntax instead
  add changelog yml file
  correct User_agent placement in robots.txt
  Fixing typo
  Fix Project#update_repository_size to convert MB to Bytes properly
  Remove repository trait from factories that don't need it in features
  Add the `:repository` trait to `:project` factories in Cucumber steps
  Add a `:repository` trait to the `:empty_project` factory
  Update clipboard_button text: Copy commit SHA to clipboard
  Fix search bar filter dropdown scrollbars
  get rid of log
  fix UI behaviour - only make new calls when button is clicked and dropdown is not displayed
  better UI fix - simple solution
  Disable all cops in .rubocop_todo.yml
  fix spec
  refactored a bunch of stuff based on feedback
  fix serializer
  fix bug retrieving medians
  fix specs
  ...
 2017-01-18 22:23:53 -06:00
Mike Greiling 83ecc02daa resolve all prefer-const eslint violations 2017-01-18 20:33:02 -06:00
Mike Greiling 96931b1748 resolve all indent eslint violations 2017-01-18 17:16:41 -06:00
Mike Greiling e7b5945c59 resolve all semi and no-extra-semi eslint violations 2017-01-18 17:15:27 -06:00
Mike Greiling 9e4d04913a resolve all no-plusplus eslint violations 2017-01-18 17:15:27 -06:00
Bryce Johnson 64dd41a0e2 Backport timetracking frontend to CE. 2017-01-15 11:10:04 -05:00
Mike Greiling fe964cc235 migrate all javascript asset bundles and require syntax 2017-01-10 12:30:38 -06:00
Fatih Acet 12b6fdb194 Merge branch '25957-marking-a-diff-discussion-as-resolved-doesn-t-update-tooltips' into 'master' 
Defer tooltip update on Resolve Comment button after DOM cycle

Closes #25957

See merge request !8335
 2016-12-28 18:49:19 +00:00
Sam Rose 33251af3ab Defer tooltip update on Resolve Comment button after DOM cycle 2016-12-28 12:05:03 -05:00
Alfredo Sumaran ac3789d29f Merge branch 'fix-non-iife-classes' into 'master' 
Ensure javascript classes declared outside an IIFE are properties of window

See merge request !8080
 2016-12-28 16:43:55 +00:00
Mike Greiling aac4aa1094 ensure classes declared outside an IIFE are properties of window 2016-12-14 12:07:54 -06:00
Mike Greiling 8e0e902b13 resolve all instances of no-undef eslint rule violations 2016-12-14 02:11:13 -06:00
Mike Greiling 23f5865e18 expand remaining non-explicit eslint-disable blocks and factor out globals when no-undef encountered 2016-12-13 21:07:31 -06:00
Phil Hughes a085e3fb97 Fixed resolved discussion timeago not rendering 
Closes #24787
 2016-11-22 11:47:26 +00:00
Phil Hughes 948b4828ce Issue board spec fixes 2016-11-10 17:53:34 +03:00
Phil Hughes a9349f5734 Fixed jump to discussion button not showing 2016-11-10 17:53:34 +03:00
Phil Hughes c8133c53b2 Changed how resolving notes is rendered 
Vue2 was taking the template out & then appending again. This changes that
 2016-11-10 17:53:34 +03:00
Phil Hughes 4fba69dc90 Fixed up resolve discussions 2016-11-10 17:53:34 +03:00
Fatih Acet 99b421da2c Migrate Vue v1 to v2. 2016-11-10 17:53:34 +03:00
winniehell 02f94cf038 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
Phil Hughes 5461a5d10a Pass the full project path for resolve buttons 
This fixes an issue that would stop the resolve buttons working when GitLab is installed with a relative URL

Closes #21704
 2016-09-21 10:07:24 +01:00
Douwe Maan ac89bb0fad Fix jumping between discussions on changes tab 2016-08-18 18:14:47 -05:00
Douwe Maan 409bc05428 Fix bug causing “Jump to discussion” button not to show 2016-08-18 16:56:13 -05:00
Connor Shea 36fd507b4b
Function should return a boolean. 2016-08-17 12:42:16 -06:00
Connor Shea 26c49cc156
Forgot another one. 2016-08-17 12:30:59 -06:00
Connor Shea c648756a36
Fix more incomplete if/else statements. 2016-08-17 12:18:53 -06:00
Connor Shea f3acf9fd24
Remove non-standard VueJS files from vendor. 2016-08-17 10:01:26 -06:00
Connor Shea c8df2c5f06
Add return statements for if statements that were missing them. 2016-08-17 08:38:23 -06:00
Connor Shea 32e31d626f
Resolve feedback. 2016-08-15 11:25:28 -06:00
Douwe Maan 33edde50ab Don’t show “Resolve discussion” for non-author/members 2016-08-12 15:10:05 -05:00
Connor Shea 6073b281aa
Fix a bug and a test. 2016-08-10 09:13:55 -06:00
Connor Shea d7d69b2839
If the next discussion is closed, toggle it open. 2016-08-09 11:53:29 -06:00
Douwe Maan ffbba55bc8 Implement Jump behavior for Changes tab 2016-08-04 18:01:32 -07:00
Phil Hughes 69c7fc5f72 Jumps between discussions on the changes tab 
Ordered the jump to discussion by order in the DOM
 2016-08-04 11:02:04 +01:00
Phil Hughes 433f1c42c3 Comment & resolve button no longer looks for can-resolve attribute 
Fixed some bugs when removing notes
 2016-08-04 09:52:17 +01:00
Phil Hughes ee62a2fd5a Moved update headline HTML into discussion model 2016-08-01 11:31:35 +01:00
Phil Hughes d6e724d90f Moved method to compile components from window into diffnotesapp 2016-08-01 10:21:57 +01:00