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

31 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
winniehell 572f9782d5 Remove .es6 from file extensions (!9241) 2017-03-05 21:22:40 +01: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
Mike Greiling 83ecc02daa resolve all prefer-const eslint violations 2017-01-18 20:33:02 -06:00
Mike Greiling 0b3f00492b resolve all no-dupe-keys eslint violations 2017-01-18 17:18:40 -06:00
Mike Greiling 04eff5fdb0 resolve all x-spacing and no-spaced-x eslint violations 2017-01-18 17:18:40 -06:00
Mike Greiling ccada28f30 resolve all padded-blocks 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
Mike Greiling fe964cc235 migrate all javascript asset bundles and require syntax 2017-01-10 12:30:38 -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
Alfredo Sumaran 6dbca36490 Fix Merge Conflicts app to make it work with Vue 2 2016-11-10 17:53:34 +03:00
Fatih Acet 674e9351e1 Remove unnecesarry require. 2016-11-10 17:53:34 +03:00
Fatih Acet a1fc04dfad VueJSMigration: Remove parallel-conflict-line component. 
It's because Vue says: "Component template should contain exactly one root element".
 2016-11-10 17:53:34 +03:00
Fatih Acet 0eb21fd840 Vue migration fix syntax highlighting. 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
Mike Greiling f8520f5d09 remove manual Cookie.set "path" option in favor of global setting 2016-10-24 18:09:00 -05:00
Mike Greiling 67d2b2acb3 replace jquery.cookie vendor script with js.cookie 2016-10-24 18:09:00 -05:00
Alfredo Sumaran 28dbfd5c4c Provide better error message to the user 2016-10-17 12:43:17 -05:00
Alfredo Sumaran f5de2ce3fd Add syntax highlighting to files 2016-10-13 14:16:35 -05:00
Alfredo Sumaran 6141816c23 Use plain JS to get elements and data and values 2016-10-13 14:16:35 -05:00
Alfredo Sumaran 54bfe70795 Add more tests to check conflicts resolution 2016-10-13 14:16:35 -05:00
Alfredo Sumaran c4142cf9c0 Improve components for PhantomJs compatibility 2016-10-13 14:16:35 -05:00
Alfredo Sumaran 4f76ff0ecd Use .some instead of .find for phantomjs compatibility 2016-10-13 14:16:35 -05:00
Alfredo Sumaran cebad0fb60 Do not show Diff view switcher if all files are can be only resolved with an editor 2016-10-13 14:16:35 -05:00
Alfredo Sumaran 197ac5ebbf Ability to resolve conflicts for files with `text-editor` as conflict type 2016-10-13 14:16:35 -05:00
Alfredo Sumaran a8ac9089af Refactor JS code 
- Use a store base object to manage application state.
- Add a service to handle ajax requests.
- Load code only when needed
 2016-10-13 14:16:35 -05:00
Alfredo Sumaran a3eb39a106 Replace textarea with Ace editor 2016-10-13 14:16:34 -05:00
Alfredo Sumaran 26f658decd Implement editor to manually resolve merge conflicts 2016-10-13 14:16:34 -05:00