| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Flash is now a ES6 module | Phil Hughes | 2017-10-10 | 2 | -2/+2 |
| | | | | | | | | | | | | 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. | ||||
| * | Merge branch 'master' into ph-inline-js | Phil Hughes | 2017-07-27 | 1 | -1/+1 |
| |\ | |||||
| | * | fix conflict pluralized | Emilien Mottet | 2017-07-24 | 1 | -1/+1 |
| | | | |||||
| * | | fixed label subscription & merge conflicts | Phil Hughes | 2017-07-26 | 1 | -0/+3 |
| |/ | |||||
| * | update remaining uses of CJS syntax to ES module syntax | Mike Greiling | 2017-05-16 | 1 | -8/+7 |
| | | |||||
| * | remove Cookies class from global space | Mike Greiling | 2017-03-22 | 1 | -1/+1 |
| | | |||||
| * | remove Vue from the global space | Mike Greiling | 2017-03-20 | 5 | -6/+10 |
| | | |||||
| * | Remove .es6 from file extensions (!9241) | winniehell | 2017-03-05 | 8 | -0/+0 |
| | | |||||
| * | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-01-27 | 8 | -48/+33 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ... | ||||
| | * | resolve all prefer-const eslint violations | Mike Greiling | 2017-01-18 | 2 | -10/+8 |
| | | | |||||
| | * | resolve all no-dupe-keys eslint violations | Mike Greiling | 2017-01-18 | 1 | -2/+1 |
| | | | |||||
| | * | resolve all x-spacing and no-spaced-x eslint violations | Mike Greiling | 2017-01-18 | 1 | -2/+2 |
| | | | |||||
| | * | resolve all padded-blocks eslint violations | Mike Greiling | 2017-01-18 | 7 | -19/+7 |
| | | | |||||
| | * | resolve all semi and no-extra-semi eslint violations | Mike Greiling | 2017-01-18 | 4 | -13/+13 |
| | | | |||||
| | * | resolve all no-plusplus eslint violations | Mike Greiling | 2017-01-18 | 1 | -11/+11 |
| | | | |||||
| * | | migrate all javascript asset bundles and require syntax | Mike Greiling | 2017-01-10 | 1 | -8/+8 |
| |/ | |||||
| * | expand remaining non-explicit eslint-disable blocks and factor out globals ↵ | Mike Greiling | 2016-12-13 | 8 | -9/+26 |
| | | | | | when no-undef encountered | ||||
| * | Fix Merge Conflicts app to make it work with Vue 2 | Alfredo Sumaran | 2016-11-10 | 1 | -1/+16 |
| | | |||||
| * | Remove unnecesarry require. | Fatih Acet | 2016-11-10 | 1 | -1/+0 |
| | | |||||
| * | VueJSMigration: Remove parallel-conflict-line component. | Fatih Acet | 2016-11-10 | 2 | -19/+1 |
| | | | | | It's because Vue says: "Component template should contain exactly one root element". | ||||
| * | Vue migration fix syntax highlighting. | Fatih Acet | 2016-11-10 | 1 | -1/+1 |
| | | |||||
| * | Migrate Vue v1 to v2. | Fatih Acet | 2016-11-10 | 1 | -1/+1 |
| | | |||||
| * | disable ESLint for all JavaScript files | winniehell | 2016-10-26 | 9 | -0/+9 |
| | | |||||
| * | remove manual Cookie.set "path" option in favor of global setting | Mike Greiling | 2016-10-24 | 1 | -3/+1 |
| | | |||||
| * | replace jquery.cookie vendor script with js.cookie | Mike Greiling | 2016-10-24 | 1 | -2/+2 |
| | | |||||
| * | Provide better error message to the usermerge-conflicts-editor-2 | Alfredo Sumaran | 2016-10-17 | 1 | -1/+1 |
| | | |||||
| * | Add syntax highlighting to files | Alfredo Sumaran | 2016-10-13 | 1 | -0/+1 |
| | | |||||
| * | Use plain JS to get elements and data and values | Alfredo Sumaran | 2016-10-13 | 1 | -5/+5 |
| | | |||||
| * | Add more tests to check conflicts resolution | Alfredo Sumaran | 2016-10-13 | 1 | -1/+3 |
| | | |||||
| * | Improve components for PhantomJs compatibility | Alfredo Sumaran | 2016-10-13 | 8 | -10/+93 |
| | | |||||
| * | Use .some instead of .find for phantomjs compatibility | Alfredo Sumaran | 2016-10-13 | 1 | -9/+1 |
| | | |||||
| * | Do not show Diff view switcher if all files are can be only resolved with an ↵ | Alfredo Sumaran | 2016-10-13 | 2 | -1/+14 |
| | | | | | editor | ||||
| * | Ability to resolve conflicts for files with `text-editor` as conflict type | Alfredo Sumaran | 2016-10-13 | 2 | -133/+150 |
| | | |||||
| * | Refactor JS code | Alfredo Sumaran | 2016-10-13 | 4 | -1/+537 |
| | | | | | | | - Use a store base object to manage application state. - Add a service to handle ajax requests. - Load code only when needed | ||||
| * | Replace textarea with Ace editor | Alfredo Sumaran | 2016-10-13 | 1 | -7/+20 |
| | | |||||
| * | Implement editor to manually resolve merge conflicts | Alfredo Sumaran | 2016-10-13 | 1 | -0/+63 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |