Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' | Sean McGivern | 2017-01-09 | 1 | -0/+1 | |
| | |\ | ||||||
| | | * | Record and show last used date of SSH Keys | Vincent Wong | 2017-01-09 | 1 | -0/+1 | |
| | * | | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' | Alfredo Sumaran | 2017-01-06 | 1 | -0/+4 | |
| | |\ \ | ||||||
| | | * | | Moved the members (project_members)option to a single controller called members | Jose Ivan Vargas | 2017-01-03 | 1 | -0/+4 | |
| * | | | | Merge branch 'master' into auto-pipelines-vue | Filipa Lacerda | 2017-01-05 | 1 | -0/+6 | |
| |\ \ \ \ | | |/ / / | ||||||
| * | | | | fix pipelines/index.html.haml merge conflict | Regis | 2017-01-02 | 2 | -3/+2 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | merge master and fix application.rb conflict | Regis | 2016-12-23 | 4 | -5/+32 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Grzegorz Bizon | 2016-12-21 | 11 | -7/+48 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Regis | 2016-12-16 | 3 | -1/+10 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Grzegorz Bizon | 2016-12-15 | 1 | -7/+16 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | merge master | Regis | 2016-12-13 | 2 | -2/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Grzegorz Bizon | 2016-12-09 | 2 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Grzegorz Bizon | 2016-12-07 | 1 | -11/+11 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | remove all files related to Vue SVG rendering - use dynamic svg loading | Regis | 2016-12-06 | 1 | -2/+0 | |
| * | | | | | | | | | | | fix conflict | Regis | 2016-12-02 | 3 | -1/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Regis | 2016-11-29 | 9 | -158/+184 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Regis | 2016-11-21 | 6 | -10/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | merge master | Regis | 2016-11-18 | 5 | -2/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Regis | 2016-11-15 | 4 | -0/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into avatar-vue | Regis | 2016-11-14 | 3 | -24/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | vue full conflict fix | Regis | 2016-11-11 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Regis | 2016-11-09 | 11 | -225/+225 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | extract pagination into own folder and precompile in application.rb | Regis | 2016-11-06 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | making reusable status and status icons components | Regis | 2016-11-05 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into auto-pipelines-vue | Regis | 2016-11-02 | 5 | -1/+41 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | page specific js - remove inline js - refactor | Regis | 2016-10-31 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | | prevent karma from reloading on save until webpack is ready | Mike Greiling | 2017-01-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | improve sourcemap generation | Mike Greiling | 2017-01-10 | 2 | -2/+3 | |
* | | | | | | | | | | | | | | | | | | | | | use ~ to reference non-local scripts instead of resolve.root | Mike Greiling | 2017-01-10 | 1 | -4/+2 | |
* | | | | | | | | | | | | | | | | | | | | | migrate all tests into a single webpack bundle | Mike Greiling | 2017-01-10 | 1 | -2/+1 | |
* | | | | | | | | | | | | | | | | | | | | | include spec_helper within karma config rather than each individual test | Mike Greiling | 2017-01-10 | 1 | -2/+3 | |
* | | | | | | | | | | | | | | | | | | | | | include common libraries within spec_helper | Mike Greiling | 2017-01-10 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | simplify and combine karma file patterns | Mike Greiling | 2017-01-10 | 1 | -10/+3 | |
* | | | | | | | | | | | | | | | | | | | | | Swapped out teaspoon for karma | Luke "Jared" Bennett | 2017-01-10 | 2 | -2/+32 | |
* | | | | | | | | | | | | | | | | | | | | | precompile webpack assets when testing | Mike Greiling | 2017-01-10 | 2 | -0/+4 | |
* | | | | | | | | | | | | | | | | | | | | | disable "use strict" in babel config as it was broken in sprockets | Mike Greiling | 2017-01-10 | 1 | -1/+7 | |
* | | | | | | | | | | | | | | | | | | | | | migrate all javascript asset bundles and require syntax | Mike Greiling | 2017-01-10 | 2 | -19/+22 | |
* | | | | | | | | | | | | | | | | | | | | | replace application.js sprockets output with webpack-generated equivalent | Mike Greiling | 2017-01-06 | 1 | -2/+18 | |
* | | | | | | | | | | | | | | | | | | | | | temporarily regress to babel 5 for parity with sprockets-es6 gem | Mike Greiling | 2017-01-06 | 1 | -4/+1 | |
* | | | | | | | | | | | | | | | | | | | | | conditionally apply webpack-dev-server config | Mike Greiling | 2017-01-06 | 1 | -1/+4 | |
* | | | | | | | | | | | | | | | | | | | | | optimize production output and generate sourcemaps | Mike Greiling | 2017-01-06 | 1 | -1/+15 | |
* | | | | | | | | | | | | | | | | | | | | | compile es6/es2015 with babel | Mike Greiling | 2017-01-06 | 1 | -1/+18 | |
* | | | | | | | | | | | | | | | | | | | | | add webpack, webpack-rails, and webpack-dev-server along with a simple hello ... | Mike Greiling | 2017-01-06 | 2 | -0/+51 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'monkey-patch-comment' into 'master' | Rémy Coutable | 2017-01-05 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Explain why there is a monkey-patch | Jacob Vosmaer | 2016-12-27 | 1 | -0/+6 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merged the 'groups' and 'projects' tabs when viewing user profiles | James Gregory | 2016-12-29 | 1 | -1/+0 | |
* | | | | | | | | | | | | | | | | | | | Fix 500 error when visit group from admin area if group name contains dotdz-improve-admin-group-routing | Dmitriy Zaporozhets | 2016-12-28 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'feature/more-storage-statistics' into 'master' | Sean McGivern | 2016-12-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Add more storage statistics | Markus Koller | 2016-12-21 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'permit-uploadedfile-scalar' into 'master' | Rémy Coutable | 2016-12-23 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |