Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Split routes on multiple filesdz-split-routes | Dmitriy Zaporozhets | 2016-10-05 | 10 | -803/+775 |
* | Merge branch 'fix/22225' into 'master' | Sean McGivern | 2016-10-04 | 5 | -16/+55 |
|\ | |||||
| * | Update CHANGELOGfix/22225 | Douglas Barbosa Alexandre | 2016-10-04 | 1 | -1/+2 |
| * | Skip wiki creation when GitHub project has wiki enabled | Douglas Barbosa Alexandre | 2016-10-04 | 4 | -16/+54 |
* | | Merge branch 'code-blocks-vue-pre' into 'master' | Jacob Schatz | 2016-10-04 | 5 | -6/+19 |
|\ \ | |||||
| * | | Fixed banzai test failures | Phil Hughes | 2016-10-04 | 1 | -4/+4 |
| * | | Removed puts code :see_no_evil:code-blocks-vue-pre | Phil Hughes | 2016-10-04 | 1 | -1/+0 |
| * | | Adds v-pre to code blocks in comments | Phil Hughes | 2016-10-04 | 4 | -3/+17 |
* | | | Merge branch 'rs-update-rubocop' into 'master' | Rémy Coutable | 2016-10-04 | 4 | -55/+128 |
|\ \ \ | |||||
| * | | | Update RuboCop to 0.43.0 and update configurationrs-update-rubocop | Robert Speicher | 2016-10-04 | 4 | -55/+128 |
* | | | | Merge branch 'restrict-failed-2fa-attempts' into 'master' | Rémy Coutable | 2016-10-04 | 4 | -3/+69 |
|\ \ \ \ | |||||
| * | | | | Restrict failed login attempts for users with 2FA | Sean McGivern | 2016-10-04 | 4 | -3/+69 |
* | | | | | Merge branch 'zj-save-environment-deployment-refs' into 'master' | Kamil Trzciński | 2016-10-04 | 6 | -3/+41 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | deployment refs in own folder, new method for creating refszj-save-environment-deployment-refs | Z.J. van de Weg | 2016-10-04 | 5 | -4/+18 |
| * | | | | Update method name | Zeger-Jan van de Weg | 2016-10-04 | 1 | -1/+1 |
| * | | | | Save a fetchable ref per deployement | Z.J. van de Weg | 2016-10-04 | 4 | -2/+26 |
* | | | | | Merge branch '22343-honor-user-fixed-layout-pref' into 'master' | Fatih Acet | 2016-10-04 | 11 | -33/+58 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | fix diff_view cookie path within merge conflict page22343-honor-user-fixed-layout-pref | Mike Greiling | 2016-09-20 | 1 | -1/+3 |
| * | | | | ensure the 'fixed layout' preference is honored whenever possible | Mike Greiling | 2016-09-20 | 11 | -32/+55 |
* | | | | | Merge branch 'issue_22446' into 'master' | Sean McGivern | 2016-10-04 | 4 | -0/+65 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge branch 'master' into issue_22446 | Sean McGivern | 2016-10-04 | 10 | -26/+53 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Fix bug when trying to cache closed issues from external issue trackersissue_22446 | Felipe Artur | 2016-10-03 | 4 | -0/+65 |
* | | | | | Merge branch 'cs-upgrade-acts-as-taggable-on' into 'master' | Dmitriy Zaporozhets | 2016-10-04 | 2 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Upgrade acts-as-taggable-on from 3.5.0 to 4.0.0.cs-upgrade-acts-as-taggable-on | Connor Shea | 2016-10-03 | 2 | -5/+5 |
| |/ / / / | |||||
* | | | | | Merge branch 'cleanup-mentionable-methods-arguments' into 'master' | Douwe Maan | 2016-10-04 | 6 | -27/+31 |
|\ \ \ \ \ | |||||
| * | | | | | Use SELECT 1, instead SELECT COUNT(*) to ask for notes existencycleanup-mentionable-methods-arguments | Paco Guzman | 2016-10-04 | 1 | -1/+1 |
| * | | | | | Simplify Mentionable concern instance methods | Paco Guzman | 2016-10-04 | 5 | -26/+30 |
* | | | | | | Merge branch 'rc-improve-members-destroy-service' into 'master' | Robert Speicher | 2016-10-04 | 11 | -69/+140 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove useless code now that Member#add_user handles itrc-improve-members-destroy-service | Rémy Coutable | 2016-10-03 | 1 | -8/+0 |
| * | | | | | | Invert method's naming | Rémy Coutable | 2016-10-03 | 2 | -4/+4 |
| * | | | | | | Fix a few things after the initial improvment to Members::DestroyService | Rémy Coutable | 2016-10-03 | 9 | -15/+30 |
| * | | | | | | Improve Members::DestroyService | Rémy Coutable | 2016-10-03 | 8 | -67/+131 |
* | | | | | | | Merge branch 'append-issue-template' into 'master' | Fatih Acet | 2016-10-04 | 4 | -16/+47 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Combine requestFileSuccess arguments into `opts` | Joseph Frazier | 2016-10-03 | 2 | -7/+10 |
| * | | | | | | | Append issue template to existing description | Joseph Frazier | 2016-10-03 | 4 | -13/+41 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'todo-issue-due-date' into 'master' | Robert Speicher | 2016-10-04 | 4 | -1/+29 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Removed try method call on due datetodo-issue-due-date | Phil Hughes | 2016-10-03 | 1 | -3/+11 |
| * | | | | | | Moved middot into helper method | Phil Hughes | 2016-10-03 | 2 | -2/+3 |
| * | | | | | | Moved todo due date to helper method | Phil Hughes | 2016-10-03 | 2 | -8/+7 |
| * | | | | | | Moved todo due date text into helper method | Phil Hughes | 2016-10-03 | 2 | -5/+7 |
| * | | | | | | Uses variable | Phil Hughes | 2016-10-03 | 1 | -2/+4 |
| * | | | | | | CHANGELOG item | Phil Hughes | 2016-10-03 | 1 | -0/+1 |
| * | | | | | | Added test for due date | Phil Hughes | 2016-10-03 | 1 | -1/+7 |
| * | | | | | | Added issue due date to todos row | Phil Hughes | 2016-10-03 | 1 | -0/+9 |
* | | | | | | | Merge branch 'zj-grape-sessions' into 'master' | Robert Speicher | 2016-10-04 | 1 | -12/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | GrapeDSL for Namespace endpointzj-grape-sessions | Z.J. van de Weg | 2016-10-04 | 1 | -12/+10 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'fix/import-service-issues' into 'master' | Robert Speicher | 2016-10-04 | 3 | -0/+19 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Fix issues importing services via Import/Export | James Lopez | 2016-10-04 | 3 | -0/+19 |
| |/ / / / / | |||||
* | | | | | | Merge branch '22805-container-registry-status' into 'master' | Robert Speicher | 2016-10-04 | 2 | -0/+6 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add Container Registry on/off status to admin area | the-undefined | 2016-10-03 | 2 | -0/+6 |
| | |_|/ / | |/| | | |