Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into issue-discussions-refactor | Filipa Lacerda | 2017-08-10 | 4 | -4/+7 |
|\ | |||||
| * | alternative route for download archive | haseeb | 2017-08-10 | 1 | -0/+3 |
| * | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-cop | Rémy Coutable | 2017-08-09 | 1 | -1/+1 |
| * | Re-enable SqlInjection and CommandInjection | Brian Neel | 2017-08-08 | 2 | -3/+3 |
* | | Merge branch 'master' into issue-discussions-refactor | Filipa Lacerda | 2017-08-08 | 9 | -9/+119 |
|\ \ | |/ | |||||
| * | Merge branch 'master' into ide | Mike Greiling | 2017-08-07 | 7 | -7/+47 |
| |\ | |||||
| | * | Merge branch '31207-clean-locked-merge-requests' into 'master' | Stan Hu | 2017-08-08 | 1 | -0/+4 |
| | |\ | |||||
| | | * | Store MergeWorker JID on merge request, and clean up stuck merges | Oswaldo Ferreira | 2017-08-07 | 1 | -0/+4 |
| | * | | Merge branch '32844-issuables-performance' into 'master' | Sean McGivern | 2017-08-07 | 1 | -0/+2 |
| | |\ \ | |||||
| | | * | | Move some after_create parts to worker to improve performance32844-issuables-performance | Jarka Kadlecova | 2017-08-07 | 1 | -0/+2 |
| | * | | | Merge branch '33902-upgrade-to-webpack-v3' into 'master' | Jacob Schatz | 2017-08-07 | 2 | -7/+20 |
| | |\ \ \ | |||||
| | | * | | | add thunky to approved licenses (MIT) | Mike Greiling | 2017-08-07 | 1 | -0/+6 |
| | | * | | | add disableHostCheck to devServer config since webpack dev server is proxied | Mike Greiling | 2017-08-07 | 1 | -0/+1 |
| | | * | | | replace stats-webpack-plugin with webpack-stats-plugin | Mike Greiling | 2017-08-07 | 1 | -7/+13 |
| | * | | | | Merge branch 'zj-project-templates' into 'master' | Sean McGivern | 2017-08-07 | 1 | -0/+1 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' into zj-project-templates | Filipa Lacerda | 2017-08-07 | 18 | -40/+178 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | * | | | | | Merge branch 'group-milestone-references-system-notes' into 'master' | Robert Speicher | 2017-08-07 | 1 | -0/+4 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Support references to group milestones | Sean McGivern | 2017-08-07 | 1 | -0/+4 |
| | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Add sidekiq metrics endpoint and add http server to sidekiq | Paweł Chojnacki | 2017-08-07 | 3 | -0/+16 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'master' into ide | Mike Greiling | 2017-08-07 | 7 | -5/+46 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker' | Douwe Maan | 2017-08-07 | 2 | -3/+6 |
| | |\ \ \ \ | | | |/ / / | |||||
| | * | | | | Move hostname to Gitlab::Environment | Bob Van Landuyt | 2017-08-04 | 1 | -1/+0 |
| | * | | | | Add a Circuitbreaker for storage paths | Bob Van Landuyt | 2017-08-04 | 4 | -1/+40 |
| * | | | | | Merge branch 'master' into ide | Douwe Maan | 2017-08-03 | 2 | -1/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into ide | Luke "Jared" Bennett | 2017-07-31 | 2 | -2/+5 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/master' into ide | Luke "Jared" Bennett | 2017-07-28 | 18 | -38/+188 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add define and require to window in vs transform | Luke "Jared" Bennett | 2017-07-21 | 1 | -0/+1 |
| * | | | | | | | ignore case for worker exclusion | Luke "Jared" Bennett | 2017-07-21 | 1 | -1/+1 |
| * | | | | | | | Remove all vs workers from transform | Luke "Jared" Bennett | 2017-07-21 | 1 | -1/+1 |
| * | | | | | | | exempt webworker script from copy closure transform | Luke "Jared" Bennett | 2017-07-20 | 1 | -1/+1 |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into ide | Luke "Jared" Bennett | 2017-07-20 | 35 | -112/+703 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix redundant vue library | Mike Greiling | 2017-07-18 | 1 | -1/+2 |
| * | | | | | | | | fix global context and relative_url_root for monaco editor | Mike Greiling | 2017-07-18 | 1 | -4/+25 |
| * | | | | | | | | Remove multiple methods of including monaco related code and remove static mo... | Luke "Jared" Bennett | 2017-07-18 | 1 | -0/+8 |
| * | | | | | | | | Merge branch 'dm-tree-json' into ide Resolving conflicts. | Jacob Schatz | 2017-06-23 | 9 | -28/+290 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add monaco editor. | Jacob Schatz | 2017-06-15 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'master' into issue-discussions-refactor | Filipa Lacerda | 2017-08-07 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Fix issues with pdf-js dependencies | Mike Greiling | 2017-08-07 | 1 | -1/+4 |
* | | | | | | | | | | Merge branch 'master' into issue-discussions-refactor | Filipa Lacerda | 2017-08-04 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Backport to CE for:2902-standalone-ee-dir-ce | Lin Jen-Shin | 2017-08-04 | 1 | -2/+2 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | fix #3686 make tarball download url to end with extension | haseeb | 2017-08-03 | 1 | -1/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'master' into issue-discussions-refactor | Filipa Lacerda | 2017-08-01 | 2 | -2/+10 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Inline script cleanup globals and easy | Tim Zallmann | 2017-08-01 | 1 | -0/+5 |
| * | | | | | | | Fix LDAP documentation and example configmk-fix-ldap-ca-file-docs | Michael Kozono | 2017-07-31 | 1 | -1/+1 |
| | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge branch 'inline-js-removal-projects-other' into 'master' | Phil Hughes | 2017-07-31 | 1 | -1/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Converted Pipelines Charts | Tim Zallmann | 2017-07-27 | 1 | -0/+1 |
| | * | | | | | | Moved Inline JS for Pipelines Charts + new Pipeline to dispatcher | Tim Zallmann | 2017-07-27 | 1 | -1/+2 |
| | * | | | | | | Project New moved to external File | Tim Zallmann | 2017-07-27 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-07-31 | 18 | -37/+187 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Ensure Gitlab::Application.routes.default_url_options are set correctly in Ca... | Rémy Coutable | 2017-07-28 | 1 | -1/+1 |
| | |_|_|_|/ / | |/| | | | | |