summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into all-skipped-equals-successall-skipped-equals-successLin Jen-Shin2016-10-055-6/+19
|\
| * Merge branch 'code-blocks-vue-pre' into 'master' Jacob Schatz2016-10-045-6/+19
| |\
| | * Fixed banzai test failuresPhil Hughes2016-10-041-4/+4
| | * Removed puts code :see_no_evil:code-blocks-vue-prePhil Hughes2016-10-041-1/+0
| | * Adds v-pre to code blocks in commentsPhil Hughes2016-10-044-3/+17
* | | Introduce all_state_names so that we could avoid NOT INLin Jen-Shin2016-10-052-2/+6
* | | Merge remote-tracking branch 'upstream/master' into all-skipped-equals-successLin Jen-Shin2016-10-0485-369/+784
|\ \ \ | |/ /
| * | Merge branch 'rs-update-rubocop' into 'master' Rémy Coutable2016-10-044-55/+128
| |\ \
| | * | Update RuboCop to 0.43.0 and update configurationrs-update-rubocopRobert Speicher2016-10-044-55/+128
| * | | Merge branch 'restrict-failed-2fa-attempts' into 'master' Rémy Coutable2016-10-044-3/+69
| |\ \ \
| | * | | Restrict failed login attempts for users with 2FASean McGivern2016-10-044-3/+69
| * | | | Merge branch 'zj-save-environment-deployment-refs' into 'master' Kamil Trzciński2016-10-046-3/+41
| |\ \ \ \
| | * | | | deployment refs in own folder, new method for creating refszj-save-environment-deployment-refsZ.J. van de Weg2016-10-045-4/+18
| | * | | | Update method nameZeger-Jan van de Weg2016-10-041-1/+1
| | * | | | Save a fetchable ref per deployementZ.J. van de Weg2016-10-044-2/+26
| * | | | | Merge branch '22343-honor-user-fixed-layout-pref' into 'master' Fatih Acet2016-10-0411-33/+58
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | fix diff_view cookie path within merge conflict page22343-honor-user-fixed-layout-prefMike Greiling2016-09-201-1/+3
| | * | | | ensure the 'fixed layout' preference is honored whenever possibleMike Greiling2016-09-2011-32/+55
| * | | | | Merge branch 'issue_22446' into 'master' Sean McGivern2016-10-044-0/+65
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch 'master' into issue_22446Sean McGivern2016-10-0410-26/+53
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Fix bug when trying to cache closed issues from external issue trackersissue_22446Felipe Artur2016-10-034-0/+65
| * | | | | Merge branch 'cs-upgrade-acts-as-taggable-on' into 'master' Dmitriy Zaporozhets2016-10-042-5/+5
| |\ \ \ \ \
| | * | | | | Upgrade acts-as-taggable-on from 3.5.0 to 4.0.0.cs-upgrade-acts-as-taggable-onConnor Shea2016-10-032-5/+5
| | |/ / / /
| * | | | | Merge branch 'cleanup-mentionable-methods-arguments' into 'master' Douwe Maan2016-10-046-27/+31
| |\ \ \ \ \
| | * | | | | Use SELECT 1, instead SELECT COUNT(*) to ask for notes existencycleanup-mentionable-methods-argumentsPaco Guzman2016-10-041-1/+1
| | * | | | | Simplify Mentionable concern instance methodsPaco Guzman2016-10-045-26/+30
| * | | | | | Merge branch 'rc-improve-members-destroy-service' into 'master' Robert Speicher2016-10-0411-69/+140
| |\ \ \ \ \ \
| | * | | | | | Remove useless code now that Member#add_user handles itrc-improve-members-destroy-serviceRémy Coutable2016-10-031-8/+0
| | * | | | | | Invert method's namingRémy Coutable2016-10-032-4/+4
| | * | | | | | Fix a few things after the initial improvment to Members::DestroyServiceRémy Coutable2016-10-039-15/+30
| | * | | | | | Improve Members::DestroyServiceRémy Coutable2016-10-038-67/+131
| * | | | | | | Merge branch 'append-issue-template' into 'master' Fatih Acet2016-10-044-16/+47
| |\ \ \ \ \ \ \
| | * | | | | | | Combine requestFileSuccess arguments into `opts`Joseph Frazier2016-10-032-7/+10
| | * | | | | | | Append issue template to existing descriptionJoseph Frazier2016-10-034-13/+41
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'todo-issue-due-date' into 'master' Robert Speicher2016-10-044-1/+29
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Removed try method call on due datetodo-issue-due-datePhil Hughes2016-10-031-3/+11
| | * | | | | | Moved middot into helper methodPhil Hughes2016-10-032-2/+3
| | * | | | | | Moved todo due date to helper methodPhil Hughes2016-10-032-8/+7
| | * | | | | | Moved todo due date text into helper methodPhil Hughes2016-10-032-5/+7
| | * | | | | | Uses variablePhil Hughes2016-10-031-2/+4
| | * | | | | | CHANGELOG itemPhil Hughes2016-10-031-0/+1
| | * | | | | | Added test for due datePhil Hughes2016-10-031-1/+7
| | * | | | | | Added issue due date to todos rowPhil Hughes2016-10-031-0/+9
| * | | | | | | Merge branch 'zj-grape-sessions' into 'master' Robert Speicher2016-10-041-12/+10
| |\ \ \ \ \ \ \
| | * | | | | | | GrapeDSL for Namespace endpointzj-grape-sessionsZ.J. van de Weg2016-10-041-12/+10
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'fix/import-service-issues' into 'master' Robert Speicher2016-10-043-0/+19
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Fix issues importing services via Import/ExportJames Lopez2016-10-043-0/+19
| | |/ / / / /
| * | | | | | Merge branch '22805-container-registry-status' into 'master' Robert Speicher2016-10-042-0/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add Container Registry on/off status to admin areathe-undefined2016-10-032-0/+6
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'remove-hex-shorties' into 'master' Stan Hu2016-10-042-2/+2
| |\ \ \ \ \
View Lorry Controller Status